Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 14:54:45 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 11 Sep 2006 14:54:45 +0000 (07:54 -0700)
commit08a55c01b504360d48b8123c87b383f7e6a2ef21
tree33d8591741486a959b6130a5c8b73382db16cbe1
parent3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc
parent519854876c66bd04b0c12d3cead6e0e5fc5a1167
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:
  [PATCH] Fix dm9000 release_resource