Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 00:01:19 +0000 (17:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 00:01:19 +0000 (17:01 -0700)
commit9d20593a722c2dab7a5ab74f5d8c9b604aca52f9
treeb5492b3191f29f68018c4d76f41f8bab379db0c5
parent9b59a0a4eefa132a3899b6e8d362f92559c67844
parent9205124c66a69664c6825501cb062ebd2acd3b3a
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  powerpc/5200: Build fix for mpc52xx watchdog timer code
  of: Fix comparison of "compatible" properties
  powerpc/52xx: update defconfigs
  spi/omap2_mcspi: Use transaction speed if provided
  spi/omap2_mcspi: fix NULL pointer dereference
  uartlite: Fix build on sparc.