Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux...
authorJeff Garzik <jeff@garzik.org>
Thu, 7 Aug 2008 08:05:46 +0000 (04:05 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 7 Aug 2008 08:05:46 +0000 (04:05 -0400)
commit3859069bc3358772b08bd91efe9edec39a746ea8
tree9ffe71711dd98cf511ad21d9990c597de0ac3b2b
parente2c709b0ba2886b5438b666222b4b3faf82d65a9
parent867240f7b2a37b1be4ba37d904a9064a96c82099
Merge branch 'for-jeff' of git://git./linux/kernel/git/chris/linux-2.6 into tmp
drivers/char/pcmcia/synclink_cs.c
drivers/char/synclink.c
drivers/char/synclink_gt.c
drivers/char/synclinkmp.c
drivers/net/wan/Kconfig
drivers/net/wan/cosa.c