Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/power...
authorPaul Mackerras <paulus@samba.org>
Sun, 21 Sep 2008 23:17:25 +0000 (18:17 -0500)
committerPaul Mackerras <paulus@samba.org>
Sun, 21 Sep 2008 23:17:25 +0000 (18:17 -0500)

Trivial merge