Merge branch 'rhel6' of ssh://git.onelab.eu/git/linux-2.6 into rhel6
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 12:01:50 +0000 (13:01 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 6 Nov 2011 12:01:50 +0000 (13:01 +0100)

Trivial merge