]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'master' of ../linux-2.6-xarm into master-witharm
authorJohn Linn <john.linn@xilinx.com>
Thu, 3 Nov 2011 00:42:20 +0000 (17:42 -0700)
committerJohn Linn <john.linn@xilinx.com>
Thu, 3 Nov 2011 00:42:20 +0000 (17:42 -0700)

Trivial merge