From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2011 17:06:54 +0000 (-0700)
Subject: Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux
X-Git-Tag: v2.6.39-rc1~386
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e77277dfe28baed73b6fd7c66c3fb44580a3dac1

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
---

e77277dfe28baed73b6fd7c66c3fb44580a3dac1