tree 4dd5e6654d80e3e20d025b6e37abfeedf498e32d
parent 592952df773d8181c2bb87d559c097be7fbaf695
parent 5616c989c9733e2df77ef0936a2ae397e24f58df
author Elliott Hughes <enh@google.com> 1348519436 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348519436 -0700

am 5616c989: am 77579f14: Merge "[MIPS] Add the new headers which get used when CONFIG_32BIT is defined. Pulled from kernel/common and android-3.4 branch. The SHA1 is 76e10d158efb6d4516018846f60c2ab5501900bc"

* commit '5616c989c9733e2df77ef0936a2ae397e24f58df':
  [MIPS] Add the new headers which get used when CONFIG_32BIT is defined. Pulled from kernel/common and android-3.4 branch. The SHA1 is 76e10d158efb6d4516018846f60c2ab5501900bc