diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-04 21:41:35 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-04 21:41:35 -0700 |
commit | f81a3a1f687a4a90025822dd54e51d7117a6cba7 (patch) | |
tree | 5871e5a0582bbe4161f469e4e73f6f75655e8cbd /kernel/timeconst.pl | |
parent | 3729d4a41d1c706ecdfa2fb0bbf37d8ab73ec959 (diff) | |
parent | 28e515878f8896b33c325ff9767cb0237210fb4c (diff) | |
download | linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.gz linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.bz2 linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.zip |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Two regression fixes and one boot-loader compatibility fix from Simon Horman.
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: armadillo800eva: enable rw rootfs mount
ARM: shmobile: mackerel: fixup usb module order
ARM: shmobile: armadillo800eva: fixup: sound card detection order
Diffstat (limited to 'kernel/timeconst.pl')
0 files changed, 0 insertions, 0 deletions