Merge branch 'merge'
authorAuke Kok <auke-jan.h.kok@intel.com>
Mon, 12 Mar 2012 16:56:11 +0000 (09:56 -0700)
committerAuke Kok <auke-jan.h.kok@intel.com>
Mon, 12 Mar 2012 16:56:11 +0000 (09:56 -0700)
commit2b7f64c2b2e47ec8fb13b79fd872129ddcb7e5fc
tree1ad8d4bbbc093cb2546866de27e65c3ff8d39fcf
parent6af1e198e30804a54800abfc3e0b2ab9b4fe1dd8
parent98835edfe57e5b0da252622119c8e107eae48836
Merge branch 'merge'

Conflicts:
bootchart.c