Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 17 Nov 2006 00:40:04 +0000 (16:40 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 17 Nov 2006 00:40:04 +0000 (16:40 -0800)
commit1b9bb3c14c60324b54645ffefbe6d270f9fd191c
treee22157379c9b826f9691a0a9af0be7f08cc68d37
parent0e12c5e85e6fe0a247d547a28a1884915cd3f5b9
parentd355c3c23ce56ab83e41f2bfb30d02fb90618530
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  aoe: Add forgotten NULL at end of attribute list in aoeblk.c
  debugfs: check return value correctly
  W1: ioremap balanced with iounmap