[kernel/rawhide/user/myoung/xendom0: 3/4] Merge branch 'master' into rawhide/user/myoung/xendom0

[myoung]

commit caa69bbc91bb06440293db642591e18b105f6ab9
Merge: d8422af 84056ee
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Jan 25 18:56:13 2011 +0000

    Merge branch 'master' into rawhide/user/myoung/xendom0

 kernel.spec                   |   10 ++++++++--
 perf-gcc460-build-fixes.patch |    2 +-
 sources                       |    1 +
 3 files changed, 10 insertions(+), 3 deletions(-)
---