Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDario Faggioli <raistlin@linux.it>
Tue, 28 Dec 2010 11:16:01 +0000 (12:16 +0100)
committerDario Faggioli <raistlin@linux.it>
Tue, 28 Dec 2010 11:16:01 +0000 (12:16 +0100)
commit2bf42d257dfcb460ab3817cc90168ab71263149b
treee0ed2edc13b72d38f248b8d4962831dda933d00c
parent1a21b2b26fb033598e7c97c8fabd0b83ed868a69
parentffc96d628b651b69b39909fc3e9e8f465df1eed3
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
MAINTAINERS
drivers/acpi/battery.c
kernel/kthread.c
tools/perf/util/header.c
tools/perf/util/symbol.c
tools/perf/util/symbol.h