Merge branch 'pm' into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Sep 2011 21:39:23 +0000 (22:39 +0100)
commitb0a37dca72a05b7b579f288d8a67afeed96bffa5
treea3057a3debd078f569e90e709d7b320006d8cb32
parentf70cac8d9c7125f83048f8b3d1c60f5a041a165c
parent8e6f83bbdf770014c070c5a41c8e89617cb2a66b
Merge branch 'pm' into devel-stable
arch/arm/kernel/Makefile