]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'master' of /home/linnj/linux_arm/devel/linux-2.6-xarm
authorGIT Repo <git@linrock7.(none)>
Mon, 8 Nov 2010 23:27:17 +0000 (16:27 -0700)
committerGIT Repo <git@linrock7.(none)>
Mon, 8 Nov 2010 23:27:17 +0000 (16:27 -0700)
Resolved Conflicts:

arch/arm/configs/xilinx_defconfig

1  2 
arch/arm/configs/xilinx_defconfig

Simple merge