tree d7d08779bfc836382537c23298613f5948368bdc
parent 133b170f08d6c20578f25b1ae71f80a5e638ccb6
parent 2e6713c7662cc5ebc7346b033c404cb2f708fd51
author Paul Mundt <lethal@linux-sh.org> 1249365939 +0900
committer Paul Mundt <lethal@linux-sh.org> 1249365939 +0900

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk