]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e12c5e d355c3c)
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)
* 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


Trivial merge
Linux 2.6 source tree