7 -0700 committer Greg Kroah-Hartman 1155247637 -0700 Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm c