]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pstore' and 'misc-3.2' into next
authorTony Luck <tony.luck@intel.com>
Fri, 7 Oct 2011 21:31:18 +0000 (14:31 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 7 Oct 2011 21:31:18 +0000 (14:31 -0700)
1  2  3 
arch/ia64/Kconfig
arch/ia64/configs/generic_defconfig

Simple merge
Simple merge