summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-10-14 23:30:18 -0700
committerOlof Johansson <olof@lixom.net>2014-10-14 23:30:36 -0700
commit6d81dc87c0fac76efabcde6884fcbe4cec874a83 (patch)
tree5cf7268e8693832f0e1af446883c0d5e651b7576 /fs/nilfs2
parent9a2ad529ed26c4dd81368d0bc87fc77db1febb35 (diff)
parentb16ccfe02313acd829debfccac45531f45d797cd (diff)
Merge tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Two omap fixes for v3.18 merge window" from Tony Lindgren: Two omap fixes for issues noticed during the merge window: - We need to enable ARM errata 430973 for omap3 - The smc91x on some early n900 boards need to be disabled for now until the dependencies to specific a bootloader version are fixed * tag 'fixes-for-v3.18-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Disable smc91x on n900 until bootloader dependency is removed ARM: omap2plus_defconfig: Enable ARM erratum 430973 for omap3 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions