]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'linus' of ../linux-2.6 into master-2.6.38 xilinx_v2.6.38
authorJohn Linn <john.linn@xilinx.com>
Tue, 15 Mar 2011 15:04:52 +0000 (09:04 -0600)
committerJohn Linn <john.linn@xilinx.com>
Tue, 15 Mar 2011 15:04:52 +0000 (09:04 -0600)
1  2 
arch/arm/include/asm/mach/arch.h

Simple merge