From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 17 Nov 2006 00:40:04 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v3.12-rc1~31920^2~20^2~81
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b9bb3c14c60324b54645ffefbe6d270f9fd191c;p=kernel%2Fkernel-generic.git

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
---

1b9bb3c14c60324b54645ffefbe6d270f9fd191c