From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 04:00:29 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.39-rc1~56
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=56a9ccb7ba5ffd5f285e3a9628cb446192c8639c;hp=-c

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (30 commits)
  bq20z75: Fix time and temp units
  bq20z75: Fix issues with present and suspend
  z2_battery: Fix count of properties
  s3c_adc_battery: Fix method names when PM not set
  z2_battery: Add MODULE_DEVICE_TABLE
  ds2782_battery: Add MODULE_DEVICE_TABLE
  bq20z75: Add MODULE_DEVICE_TABLE
  power_supply: Update power_supply_is_watt_property
  bq20z75: Add i2c retry mechanism
  bq20z75: Add optional battery detect gpio
  twl4030_charger: Make the driver atomic notifier safe
  bq27x00: Use single i2c_transfer call for property read
  bq27x00: Cleanup bq27x00_i2c_read
  bq27x00: Minor cleanups
  bq27x00: Give more specific reports on battery status
  bq27x00: Add MODULE_DEVICE_TABLE
  bq27x00: Add new properties
  bq27x00: Poll battery state
  bq27x00: Cache battery registers
  bq27x00: Add bq27000 support
  ...
---

56a9ccb7ba5ffd5f285e3a9628cb446192c8639c
diff --combined include/linux/leds.h
index 383811d9af83,ffd5c3d91193..61e0340a4b77
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@@ -145,6 -145,9 +145,9 @@@ extern void led_trigger_register_simple
  extern void led_trigger_unregister_simple(struct led_trigger *trigger);
  extern void led_trigger_event(struct led_trigger *trigger,
  				enum led_brightness event);
+ extern void led_trigger_blink(struct led_trigger *trigger,
+ 			      unsigned long *delay_on,
+ 			      unsigned long *delay_off);
  
  #else
  
@@@ -194,11 -197,11 +197,11 @@@ struct gpio_led 
  
  struct gpio_led_platform_data {
  	int 		num_leds;
 -	struct gpio_led *leds;
 +	const struct gpio_led *leds;
  
  #define GPIO_LED_NO_BLINK_LOW	0	/* No blink GPIO state low */
  #define GPIO_LED_NO_BLINK_HIGH	1	/* No blink GPIO state high */
 -#define GPIO_LED_BLINK		2	/* Plase, blink */
 +#define GPIO_LED_BLINK		2	/* Please, blink */
  	int		(*gpio_blink_set)(unsigned gpio, int state,
  					unsigned long *delay_on,
  					unsigned long *delay_off);