]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 19:55:16 +0000 (11:55 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 19:55:16 +0000 (11:55 -0800)
commita7c2491a13cc72fc09c062e635b9a77ff6bb4a73
treef8f4ed7bbc05369aadfd32668b892fe2740a0f3b
parent1836098f97d22c81652aeeec64d1819dc2177bdb
parent3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6