]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:39:52 +0000 (12:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:39:52 +0000 (12:39 +1000)
commit9df69c756aec5ccfebb0bcb9b16b57c93c6e4251
tree1a3af7aefe4df0a40a1bc84acbdaae059ea4b930
parent852ab8d49cf95174fc54d3280683486cc9eaf1be
parentf1807735d3765702f9c0742372cf641e580b0d95
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
MAINTAINERS
14 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm/mach-tegra/Kconfig
arch/cris/Kconfig
arch/powerpc/platforms/Kconfig
drivers/acpi/internal.h
drivers/acpi/scan.c
drivers/ata/libata-core.c
fs/cifs/transport.c
fs/nfs/inode.c
fs/nfs/nfs3proc.c
fs/nfs/nfs4proc.c
include/acpi/acpi_bus.h
net/sunrpc/sched.c