Grant Likely 38a5d6736e Merge commit 'v2.6.38-rc6' into devicetree/next ... Conflicts: drivers/spi/pxa2xx_spi_pci.c		2011-02-28 01:36:21 -07:00
..
bindings	Merge commit 'v2.6.38-rc6' into devicetree/next	2011-02-28 01:36:21 -07:00
booting-without-of.txt