]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commit
projects / lisovros / linux_canprio.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc55875 3b8458a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:27:52 +0000 (19:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jun 2008 02:27:52 +0000 (19:27 -0700)
commitd5301a0e884b0dced6e13837f00505f871e3458f
tree2bf71e6123a4aaf912a6a76fac3da23d8c5e22b2tree | snapshot
parentcc55875e26e2b85484b196edbada6caf84eb7765commit | diff
parent3b8458a9793a92a6ca3cb24e309f19821bf0d8e5commit | 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.
CAN classifier for Linux Traffic Control