| commit | 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 17:01:19 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 17:01:19 2010 -0700 |
| tree | b5492b3191f29f68018c4d76f41f8bab379db0c5 | |
| parent | 9b59a0a4eefa132a3899b6e8d362f92559c67844 [diff] | |
| parent | 9205124c66a69664c6825501cb062ebd2acd3b3a [diff] |
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.