]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'metag/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:52:22 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:52:22 +0000 (10:52 +1100)
commitae585d58e66b0cba5d9b8138b0218284471a2465
tree8608ee6d6dc8c43a18c3b1df18e094bb45d6be6d
parent30d0db5e5e50fa81d3123c919f5730eb5a4404e7
parentf1cbc24247f5cc7dc698d81d4963ec9a72681c50
Merge remote-tracking branch 'metag/for-next'

Conflicts:
tools/perf/perf.h
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/acpi/osl.c
kernel/sysctl.c
mm/page_alloc.c
tools/perf/perf.h