Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 18:58:19 +0000 (10:58 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 7 Dec 2007 18:58:19 +0000 (10:58 -0800)
commitbbce0b5ca2884b44dbfffff77e876a90b4184516
tree5d2caf13e0f8a7b8e3764f31c29f102c7964adc9
parent5fa2e1591300267b1e082c693d0b4da8e4943551
parentdc47206e552c0850ad11f7e9a1fca0a3c92f5d65
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: Fix led trigger locking bugs