Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:43:36 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:43:36 +0000 (15:43 -0700)
commit3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13
tree10782f75b5b09e9bb738534410af106efb0cf926
parentc7659e2c139d0be4647bef89188a932e0254d709
parent529d303e075aa6d988f30935b8995ffb382ad38e
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sky2: jumbo frame regression fix
  [PATCH] softmac: Fix compiler-warning
  [PATCH] bcm43xx: Correct printk with PFX before KERN_