Merge remote-tracking branch 'hwmon-staging/hwmon-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)
diff --cc Documentation/feature-removal-schedule.txt
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Sep 2012 00:48:17 +0000 (10:48 +1000)