Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:36:03 +0000 (08:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 May 2006 15:36:03 +0000 (08:36 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] sky2: fix jumbo packet support


Trivial merge