Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 07:27:42 +0000 (16:27 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Nov 2013 07:27:42 +0000 (16:27 +0900)
commit85b656cf1560e27a89354a23f2c10ba229d2f173
tree53c8b9d30c45dad618a704fd4a5b6aa5b95250cd
parent2b684c073f32b557661eba191ce0a584020367e2
parent30dae2f98612d7c8cd855861b9de205ebd9ef4fa
Merge branch 'for-next' of git://git./linux/kernel/git/cooloney/linux-leds

Pull LED subsystem changes from Bryan Wu:
 "LED subsystem updates for 3.13 are basically cleanup and also add a
  new driver for PCA9685"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: lp55xx: handle enable pin in driver
  leds-gpio: of: led should not be created if its status is disabled
  of: introduce of_get_available_child_count
  leds: Added driver for the NXP PCA9685 I2C chip
  leds: pwm: Remove redundant of_match_ptr
  leds: Include linux/of.h header
  leds: dac124s085: Remove redundant spi_set_drvdata
  leds: lp55xx: enable setting default trigger
  leds: blinkm: Remove redundant break
arch/arm/mach-omap2/board-rx51-peripherals.c
include/linux/of.h