]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
Merge branch 'pele-peep5' into pele-peep5-2.6.35
authorJohn Linn <john.linn@xilinx.com>
Wed, 6 Oct 2010 16:54:14 +0000 (10:54 -0600)
committerJohn Linn <john.linn@xilinx.com>
Wed, 6 Oct 2010 16:54:14 +0000 (10:54 -0600)

Trivial merge