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

drivers/net/dm9000.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -377,8 +377,8 @@ dm9000_release_board(struct platform_device pdev, struct board_info db)
		kfree(db->data_req);
		}

		if (db->addr_res != NULL) {
		release_resource(db->addr_res);
		if (db->addr_req != NULL) {
		release_resource(db->addr_req);
		kfree(db->addr_req);
		}
		}