diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-20 09:42:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-20 09:42:09 -0700 |
| commit | a4d7a122385e27bdd91101635c704327d7c0d87f (patch) | |
| tree | c7d2d601a0ff53194b4235e8f35e09234f98937b /include/mtd | |
| parent | 61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5 (diff) | |
| parent | 10aa5a35e34fb00a2dd814447199f08756eb307b (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"This includes three MMCI changes - one to fix up the wrong version of
the DT support patch which was merged, and two to make deferred
probing work. It also includes a fix to the OMAP SPI driver which is
causing a boot time warning.
The remainder are very minor ARM fixes."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
SPI: fix over-eager devm_xxx() conversion
ARM: 7427/1: mmc: mmci: Defer probe() in case of yet uninitialized GPIOs
ARM: 7426/1: mmc: mmci: Remove wrong error handling of gpio 0
ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned
ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support
ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slot
ARM: 7422/1: mmc: mmci: Allocate platform memory during Device Tree boot
Diffstat (limited to 'include/mtd')
0 files changed, 0 insertions, 0 deletions