Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[linux-2.6.git] / lib / prio_heap.c
2009-01-06 Harvey Harrison lib: fix sparse shadowed variable warning
2007-10-19 Paul Menage Fix cpusets update_cpumask