From: Linus Torvalds Date: Sat, 24 Dec 2005 19:55:16 +0000 (-0800) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.15-rc7~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a7c2491a13cc72fc09c062e635b9a77ff6bb4a73;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 --- a7c2491a13cc72fc09c062e635b9a77ff6bb4a73