1
0
Fork 0
alistair23-linux/arch/blackfin
Linus Torvalds 1acd2de5fa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input updates from Dmitry Torokhov:
 "The second round of updates for the input subsystem.

  Updates to ALPS an bfin_roraty drivers and a couple oother fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - use IS_ENABLED instead of homegrown code
  Input: bfin_rotary - introduce open and close methods
  Input: bfin_rotary - convert to use managed resources
  Input: bfin_rotary - use generic IO functions
  Input: bfin_rotary - move pin lists into into platform data
  Input: bfin_rotary - move platform header to linux/platform_data
  Input: bfin_rotary - mark suspend and resume code as __maybe_unused
  Input: bfin_rotary - fix potential oops in interrupt handler
  Input: ALPS - move v7 packet info to Documentation and v6 packet info
  Input: ALPS - fix confusing comment in protocol data
  Input: ALPS - do not mix trackstick and external PS/2 mouse data
  Input: ALPS - fix trackstick detection on some Dell Latitudes
  Input: ALPS - consolidate setting protocol parameters
  Input: ALPS - split protocol data from model info
  Input: ALPS - make Rushmore a separate protocol
  Input: ALPS - renumber protocol numbers
  Input: adi - remove an unnecessary check
  Input: pxa27x_keypad - remove an unneeded NULL check
  Input: soc_button_array - use "Windows" key for "Home"
2015-02-21 12:59:04 -08:00
..
boot blackfin: Ignore generated uImages 2013-09-13 10:42:39 +08:00
configs defconfig: BF609: update spi config name 2014-07-26 08:32:49 +08:00
include Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2015-02-21 12:59:04 -08:00
kernel all arches, signal: move restart_block to struct task_struct 2015-02-12 18:54:12 -08:00
lib blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
mach-bf518 blackfin: cleanup board files 2014-04-12 08:48:01 +08:00
mach-bf527 Input: bfin_rotary - use generic IO functions 2015-02-15 16:06:28 -08:00
mach-bf533 arch/blackfin/mach-bf533/boards/stamp.c: add linux/delay.h 2015-01-08 15:10:52 -08:00
mach-bf537 pata_platform: Remove useless irq_flags field 2014-08-23 13:05:08 -04:00
mach-bf538 blackfin: cleanup board files 2014-04-12 08:48:01 +08:00
mach-bf548 Input: bfin_rotary - use generic IO functions 2015-02-15 16:06:28 -08:00
mach-bf561 pata_platform: Remove useless irq_flags field 2014-08-23 13:05:08 -04:00
mach-bf609 Input: bfin_rotary - use generic IO functions 2015-02-15 16:06:28 -08:00
mach-common blackfin: mach-common: ints-priority: remove unused function 2015-01-20 14:07:04 +01:00
mm mm/blackfin: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:35 -07:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
Clear_BSD.txt blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
Kconfig treewide: Fix typos in Kconfig 2014-09-26 11:12:28 +02:00
Kconfig.debug consolidate per-arch stack overflow debugging options 2013-07-04 11:25:39 -07:00
Makefile blackfin: rename vmImage to uImage after we move to buildroot 2013-05-07 18:26:39 +08:00