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

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 04:16:16 +0000 (15:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 04:16:16 +0000 (15:16 +1100)
commit	abe9c39afefddc2d670cc2abf8c3537f2172d66d
tree	bb86ea1683933e9204196b8fb798057e74cd2de8	tree \| snapshot
parent	8d918e2e02003be9fa5b74cd4c7afc698fb1f992	commit \| diff
parent	6710c61d03d5bab8321208156113a31676967407	commit \| diff

Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
drivers/platform/x86/apple-gmux.c
drivers/platform/x86/compal-laptop.c
drivers/platform/x86/fujitsu-tablet.c
drivers/platform/x86/ideapad-laptop.c
drivers/platform/x86/intel_oaktrail.c
drivers/platform/x86/toshiba_acpi.c

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/platform/x86/asus-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/fujitsu-tablet.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/ideapad-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/sony-laptop.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history