diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 08:21:41 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 08:21:41 (GMT) |
| commit | 7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902 (patch) | |
| tree | c76aeb5996fa8f39b838e9cc41f40f854db01912 /drivers/usb/host/ohci-omap.c | |
| parent | 695884fb8acd9857e0e7120ccb2150e30f4b8fef (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
| download | linux-fsl-qoriq-7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902.tar.xz | |
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches
depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
0 files changed, 0 insertions, 0 deletions