git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 98534a6 2603711)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 11 Oct 2011 06:15:56 +0000 (17:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 11 Oct 2011 06:15:56 +0000 (17:15 +1100)
commit	1bc4f7ab5e276c46df4325c88e01099555ab7d60
tree	9a23c2a3c29f7aee606e897a2abd6572957cd0f4	tree \| snapshot
parent	98534a67d27bdaa42ec9d2274677f30bc780c214	commit \| diff
parent	260371117cce5d3563b6d2a5f7fc25488e6d3f95	commit \| diff

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

19 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/power/basic-pm-debugging.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-ap4evb.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/board-mackerel.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/btusb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/sound/pcm.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/power/Kconfig	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history
sound/usb/card.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules