Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 14 Sep 2007 21:04:13 +0000 (14:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 14 Sep 2007 21:04:13 +0000 (14:04 -0700)
commit53a3f3087be361dacfc02e7a85b6d6142a41ce8a
tree7f8ce78b0a7063361b9818e94044c000bf15007a
parent6455c66a8750170c2b4a41c6f6c53310a49e08ce
parent0931ce8439365358b1cacf888ddc8fb008036125
Merge branch 'for-linus' of /linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix some bugs in lib/string.h functions found by our string testing modules
  Blackfin arch: fix the aliased write macros
  Blackfin arch: Update/Fix PM support add new pm_ops valid