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: 9a2500b 2115c4d)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Oct 2011 03:36:01 +0000 (14:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Oct 2011 03:36:01 +0000 (14:36 +1100)
commit	17f9286075194005c607269ecf6578dcef627c78
tree	863fd8094366f97b2e4fc9a00d58e7a6fcac88cf	tree \| snapshot
parent	9a2500b0047cec33c39246dc9b1eebfdf44b1e48	commit \| diff
parent	2115c4d85385afdc70ce0227bfbd0397b025a326	commit \| diff

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

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

18 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/power/basic-pm-debugging.txt	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