| commit | d5301a0e884b0dced6e13837f00505f871e3458f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 09 19:27:52 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 09 19:27:52 2008 -0700 |
| tree | 2bf71e6123a4aaf912a6a76fac3da23d8c5e22b2 | |
| parent | cc55875e26e2b85484b196edbada6caf84eb7765 [diff] | |
| parent | 3b8458a9793a92a6ca3cb24e309f19821bf0d8e5 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin serial driver: fix up tty core set_ldisc API change breakage bug Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN Blackfin arch: fixup warnings with the new cplb saved values Blackfin Serial Driver: Clean up BF54x macro in blackfin UART driver.