diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 12:55:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 12:55:04 -0700 |
| commit | 2b9d1c050d291693f257c98605028325f8146c84 (patch) | |
| tree | 756d061271ae942141aaecd8656b035f562f4906 /fs/btrfs/file.c | |
| parent | afa3cad746cc0fb547f1ab8d881db445e237840f (diff) | |
| parent | d93003e8e4e1fbbc8a06ec561a63f5aa105a4c45 (diff) | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull arm fixes from Russell King:
"A number of fixes for the PJ4/iwmmxt changes which arm-soc forced me
to take during the merge window. This stuff should have been better
tested and sorted out *before* the merge window"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B
ARM: 8041/1: pj4: fix cpu_is_pj4 check
ARM: 8040/1: pj4: properly detect existence of iWMMXt coprocessor
ARM: 8039/1: pj4: enable iWMMXt only if CONFIG_IWMMXT is set
ARM: 8038/1: iwmmxt: explicitly check for supported architectures
Diffstat (limited to 'fs/btrfs/file.c')
0 files changed, 0 insertions, 0 deletions