Merge commit 'origin/master'
commit9c54bef784d1401aa60a2a61f14665d80900361d
authorZhang Le <r0bertz@gentoo.org>
Wed, 22 Apr 2009 17:22:09 +0000 (23 01:22 +0800)
committerZhang Le <r0bertz@gentoo.org>
Wed, 22 Apr 2009 17:22:09 +0000 (23 01:22 +0800)
treea4d83b54e89f1d54d9acfb0a1295d6e8b3cce928
parentccb86643249cfe05a38852a7d306eead50f7f1da
parent6a092828f622022d34b9f4d2fcc5074f26489f79
Merge commit 'origin/master'
arch/mips/Kconfig
include/linux/suspend.h