]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:46:13 +0000 (17:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:46:13 +0000 (17:46 -0400)

Trivial merge