e4c5bf8e3d
This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| include/plat | ||
| Kconfig | ||
| Makefile | ||
| clock.c | ||
| common.c | ||
| counter_32k.c | ||
| cpu-omap.c | ||
| debug-devices.c | ||
| debug-leds.c | ||
| devices.c | ||
| dma.c | ||
| dmtimer.c | ||
| fb.c | ||
| fb.h | ||
| gpio.c | ||
| i2c.c | ||
| io.c | ||
| iommu-debug.c | ||
| iommu.c | ||
| iopgtable.h | ||
| iovmm.c | ||
| mailbox.c | ||
| mcbsp.c | ||
| mux.c | ||
| ocpi.c | ||
| omap-pm-noop.c | ||
| omap_device.c | ||
| sram.c | ||
| sram.h | ||
| usb.c | ||