diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:11:24 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:12:24 (GMT) |
| commit | ffb069a30665ec06c05916355bc3252e33fc863b (patch) | |
| tree | ba7b82696000c0f2983672d22966b83112da874e /drivers/pci/pci-label.c | |
| parent | 8d5cd1658cb0c97d5429124f9fb5caa88c460186 (diff) | |
| parent | 3756888c2a2da9c7291d39cacd1184171111b49d (diff) | |
| download | linux-fsl-qoriq-ffb069a30665ec06c05916355bc3252e33fc863b.tar.xz | |
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
arch/sparc/Kconfig
drivers/tty/tty_buffer.c
Diffstat (limited to 'drivers/pci/pci-label.c')
0 files changed, 0 insertions, 0 deletions