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: f50bb98 a802e24)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 03:27:12 +0000 (14:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 13 Oct 2011 03:27:12 +0000 (14:27 +1100)
commit	125ca8d2515dae6aec408846ca80774aef8e63c1
tree	3be4bc58dce0e337d13cb0bb79787a9b19fab4f2	tree \| snapshot
parent	f50bb98c6c700304d4180ccc56eb38bf517e58e7	commit \| diff
parent	a802e24910682918022871a9f5eb5a545e50e7fa	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