Merge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/coolone...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jun 2012 20:18:41 +0000 (23:18 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jun 2012 20:18:41 +0000 (23:18 +0300)
commitc02feeea3dadf7e312f31d832c5d1799bd3bf7e1
tree93c8c4e6027e3945fb5119b2900e7bb2114a41ab
parent6ddb99043cac53e30a38d68fe0835c901fbbbeb5
parent9473c4c16700ec965904f23234fd0f8677ce6231
Merge branch 'fixes-for-3.5' of git://git./linux/kernel/git/cooloney/linux-leds

Pull led fixes from Bryan Wu.

* 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: Make LEDS_ASIC3 and LEDS_RENESAS_TPU depend on LEDS_CLASS=y
  leds: fixed a coding style issue.
  leds: don't disable blinking when writing the same value to delay_on or delay_off