]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ia64/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:50:58 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 19 Feb 2013 23:50:58 +0000 (10:50 +1100)
commit566c202e7417a9d48038d82d02ba35d1a43adf4d
tree2b43d7dd0e4e4b948668ef3b2ff2a505e65376af
parent26ab9a28eba703cf03a7be272768c2954e7f83ae
parentc9500a763ce7a88d6b9648a12038d02ae6724d58
Merge remote-tracking branch 'ia64/next'

Conflicts:
drivers/firmware/efivars.c
init/Kconfig
MAINTAINERS
drivers/firmware/efivars.c
include/linux/efi.h
init/Kconfig
kernel/sysctl.c