commit e77277dfe28baed73b6fd7c66c3fb44580a3dac1
author Linus Torvalds <torvalds@linux-foundation.org> Tue Mar 22 10:06:54 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Mar 22 10:06:54 2011 -0700
tree 0c40be7a4ca9140d86122ed9057fe1573ea91b2d
parent 75ea6358bc7d97630a8edc2b89c930de118cf7eb
parent 9edb240696bacd53f4331119d2dfd13d4cd4852f

Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux

* 'next-samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: H1940/RX1950: Change default LED triggers
  ARM: S3C2442: RX1950: Add support for LED blinking
  ARM: S3C2442: RX1950: Retain LEDs state in suspend
  ARM: S3C2410: H1940: Fix lcd_power_set function
  ARM: S3C2410: H1940: Add battery support
  ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing
  ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again
  ARM: S3C2410: H1940: Add keys device