]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'metag/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 17 Feb 2013 23:30:28 +0000 (10:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 17 Feb 2013 23:30:28 +0000 (10:30 +1100)
commit417dae0e813555c141c0066f8628f4db0fcadfda
treecb0cede15db3dbc32e4de3645c4670020d3195c2
parentf24a260542e967ea55042620a7e63eeac07431e2
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