a0fe3cc5d3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
Input: psmouse - small formatting changes to better follow coding style
Input: synaptics - set dimensions as reported by firmware
Input: elantech - relax signature checks
Input: elantech - enforce common prefix on messages
Input: wistron_btns - switch to using kmemdup()
Input: usbtouchscreen - switch to using kmemdup()
Input: do not force selecting i8042 on Moorestown
Input: Documentation/sysrq.txt - update KEY_SYSRQ info
Input: 88pm860x_onkey - remove invalid irq number assignment
Input: i8042 - add a PNP entry to the aux device list
Input: i8042 - add some extra PNP keyboard types
Input: wm9712 - fix wm97xx_set_gpio() logic
Input: add keypad driver for keys interfaced to TCA6416
Input: remove obsolete {corgi,spitz,tosa}kbd.c
Input: kbtab - do not advertise unsupported events
Input: kbtab - simplify kbtab_disconnect()
Input: kbtab - fix incorrect size parameter in usb_buffer_free
Input: acecad - don't advertise mouse events
Input: acecad - fix some formatting issues
Input: acecad - simplify usb_acecad_disconnect()
...
Trivial conflict in Documentation/feature-removal-schedule.txt
|
||
|---|---|---|
| .. | ||
| agp | ||
| hw_random | ||
| ip2 | ||
| ipmi | ||
| mwave | ||
| pcmcia | ||
| rio | ||
| tpm | ||
| xilinx_hwicap | ||
| .gitignore | ||
| amiserial.c | ||
| apm-emulation.c | ||
| applicom.c | ||
| applicom.h | ||
| bfin_jtag_comm.c | ||
| bfin-otp.c | ||
| briq_panel.c | ||
| bsr.c | ||
| cd1865.h | ||
| consolemap.c | ||
| cp437.uni | ||
| cs5535_gpio.c | ||
| cyclades.c | ||
| defkeymap.c_shipped | ||
| defkeymap.map | ||
| digi1.h | ||
| digiFep1.h | ||
| digiPCI.h | ||
| ds1302.c | ||
| ds1620.c | ||
| dsp56k.c | ||
| dtlk.c | ||
| efirtc.c | ||
| epca.c | ||
| epca.h | ||
| epcaconfig.h | ||
| generic_nvram.c | ||
| generic_serial.c | ||
| genrtc.c | ||
| hangcheck-timer.c | ||
| hpet.c | ||
| hvc_beat.c | ||
| hvc_console.c | ||
| hvc_console.h | ||
| hvc_irq.c | ||
| hvc_iseries.c | ||
| hvc_iucv.c | ||
| hvc_rtas.c | ||
| hvc_udbg.c | ||
| hvc_vio.c | ||
| hvc_xen.c | ||
| hvcs.c | ||
| hvsi.c | ||
| i8k.c | ||
| isicom.c | ||
| istallion.c | ||
| Kconfig | ||
| keyboard.c | ||
| lp.c | ||
| Makefile | ||
| mbcs.c | ||
| mbcs.h | ||
| mem.c | ||
| misc.c | ||
| mmtimer.c | ||
| moxa.c | ||
| moxa.h | ||
| mspec.c | ||
| mxser.c | ||
| mxser.h | ||
| n_hdlc.c | ||
| n_r3964.c | ||
| n_tty.c | ||
| nozomi.c | ||
| nsc_gpio.c | ||
| nvram.c | ||
| nwbutton.c | ||
| nwbutton.h | ||
| nwflash.c | ||
| pc8736x_gpio.c | ||
| ppdev.c | ||
| ps3flash.c | ||
| pty.c | ||
| random.c | ||
| raw.c | ||
| riscom8_reg.h | ||
| riscom8.c | ||
| riscom8.h | ||
| rocket_int.h | ||
| rocket.c | ||
| rocket.h | ||
| rtc.c | ||
| scc.h | ||
| scx200_gpio.c | ||
| selection.c | ||
| ser_a2232.c | ||
| ser_a2232.h | ||
| ser_a2232fw.ax | ||
| ser_a2232fw.h | ||
| serial167.c | ||
| snsc_event.c | ||
| snsc.c | ||
| snsc.h | ||
| sonypi.c | ||
| specialix_io8.h | ||
| specialix.c | ||
| stallion.c | ||
| sx.c | ||
| sx.h | ||
| sxboards.h | ||
| sxwindow.h | ||
| synclink_gt.c | ||
| synclink.c | ||
| synclinkmp.c | ||
| sysrq.c | ||
| tb0219.c | ||
| tlclk.c | ||
| toshiba.c | ||
| tty_audit.c | ||
| tty_buffer.c | ||
| tty_io.c | ||
| tty_ioctl.c | ||
| tty_ldisc.c | ||
| tty_port.c | ||
| uv_mmtimer.c | ||
| vc_screen.c | ||
| viotape.c | ||
| virtio_console.c | ||
| vme_scc.c | ||
| vt_ioctl.c | ||
| vt.c | ||