Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Mar 2010 14:27:06 +0000 (14:27 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Mar 2010 14:27:06 +0000 (14:27 +0000)
commit2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74
treee20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8
parent3f17522ce461a31e7ced6311b28fcf5b8a763316
parent7278a22143b003e9af7b9ca1b5f1c40ae4b55d98
Merge /pub/scm/linux/kernel/git/lethal/genesis-2.6
arch/arm/kernel/perf_event.c