Merge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup' into...
authorLen Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:10:14 +0000 (22:10 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 7 Nov 2011 03:10:14 +0000 (22:10 -0500)

Trivial merge