]> rtime.felk.cvut.cz Git - linux-lin.git/commitdiff
Merge remote branch 'pisa/master'
authorRostislav Lisovy <lisovy@gmail.com>
Mon, 21 Nov 2011 09:58:27 +0000 (10:58 +0100)
committerRostislav Lisovy <lisovy@gmail.com>
Mon, 21 Nov 2011 09:58:27 +0000 (10:58 +0100)

Trivial merge