tree 33d8591741486a959b6130a5c8b73382db16cbe1
parent 3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc
parent 519854876c66bd04b0c12d3cead6e0e5fc5a1167
author Linus Torvalds <torvalds@g5.osdl.org> 1157986485 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1157986485 -0700

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/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