mirror of https://github.com/torvalds/linux.git
e4862f2f6f
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c |
||
|---|---|---|
| .. | ||
| gameport | ||
| joystick | ||
| keyboard | ||
| misc | ||
| mouse | ||
| serio | ||
| tablet | ||
| touchscreen | ||
| Kconfig | ||
| Makefile | ||
| apm-power.c | ||
| evbug.c | ||
| evdev.c | ||
| ff-core.c | ||
| ff-memless.c | ||
| fixp-arith.h | ||
| input-compat.c | ||
| input-compat.h | ||
| input-polldev.c | ||
| input.c | ||
| joydev.c | ||
| mousedev.c | ||
| sparse-keymap.c | ||
| xen-kbdfront.c | ||