Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:24:20 +0000 (11:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:24:20 +0000 (11:24 -0700)
commit90c9d4f8eeb9dd31adfb97e897039033b7a72d14
tree9cb4e0d0eee8a67dc4353ad93e6e07a54bd2ffaa
parent3344203948f40521c35a0a52e3f1bd9fbb7a1118
parent306dd85c1d41e20a07d1e821e27f5df4927bb5e7
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Remove incorrect use of preempt_count() from leds-gpio
  leds: Fix potential leds-gpio oops