iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a0a4194c94
linux/drivers/leds
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
dell-led.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig leds: Renesas TPU LED driver 2011-10-31 17:30:54 -07:00
led-class.c leds: turn the blink_timer off before starting to blink 2011-10-31 17:30:55 -07:00
led-core.c
led-triggers.c drivers/leds/led-triggers.c: fix memory leak 2011-10-31 17:30:55 -07:00
leds-88pm860x.c mfd: Use mfd cell platform_data for 88pm860x cells platform bits 2011-05-26 19:45:12 +02:00
leds-adp5520.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-ams-delta.c leds: add missing include of linux/module.h 2011-08-25 16:25:34 -07:00
leds-asic3.c mfd: Add asic3 based LED suspend/resume handlers 2011-10-24 14:09:09 +02:00
leds-atmel-pwm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-bd2802.c drivers/leds/leds-bd2802.c: bd2802_unregister_led_classdev() should unregister all registered leds 2011-08-25 16:25:35 -07:00
leds-clevo-mail.c
leds-cobalt-qube.c leds: use default-on trigger for Cobalt Qube 2009-12-17 11:38:31 +00:00
leds-cobalt-raq.c leds: leds-cobalt-raq.c - use resource_size() 2009-12-17 11:16:23 +00:00
leds-da903x.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-dac124s085.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-fsg.c IXP4xx: move FSG platform macros to the platform code. 2009-12-05 16:58:40 +01:00
leds-gpio-register.c leds: provide helper to register "leds-gpio" devices 2011-05-25 08:39:51 -07:00
leds-gpio.c drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing 2011-10-31 17:30:55 -07:00
leds-hp6xx.c leds: add missing include of linux/module.h 2011-08-25 16:25:34 -07:00
leds-lm3530.c drivers/leds/leds-lm3530.c: add __devexit_p where needed 2011-10-31 17:30:55 -07:00
leds-locomo.c collie: locomo-led change default trigger 2009-11-27 21:07:19 +01:00
leds-lp3944.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
leds-lp5521.c drivers/leds/leds-lp5521.c: check if reset is successful 2011-10-31 17:30:55 -07:00
leds-lp5523.c drivers/leds/leds-lp5523.c: fix section mismatches 2011-06-27 18:00:13 -07:00
leds-lt3593.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-mc13783.c leds: Finish mc13783 conversion to the mc13xxx API 2011-10-24 14:09:15 +02:00
leds-net48xx.c
leds-net5501.c leds: make *struct gpio_led_platform_data.leds const 2011-03-22 17:43:59 -07:00
leds-netxbig.c leds: add LED driver for Big Network series LEDs 2010-10-07 14:02:12 -04:00
leds-ns2.c leds: leds-ns2: fix private driver data storage 2010-10-07 14:00:23 -04:00
leds-pca955x.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
leds-pca9532.c drivers/leds/leds-pca9532.c: change driver name to be unique 2011-07-08 21:14:44 -07:00
leds-pwm.c leds: leds-pwm: return proper error if pwm_request failed 2011-01-26 10:49:58 +10:00
leds-rb532.c
leds-regulator.c leds/leds-regulator.c: fix handling of already enabled regulators 2011-04-14 16:06:54 -07:00
leds-renesas-tpu.c drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data 2011-10-31 17:30:55 -07:00
leds-s3c24xx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-ss4200.c leds: fix bug with reading NAS SS4200 dmi code 2010-11-25 06:50:33 +09:00
leds-sunfire.c drivers/leds/leds-sunfire.c: fix sunfire_led_generic_probe() error handling 2011-07-25 20:57:15 -07:00
leds-wm831x-status.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
leds-wm8350.c Fix common misspellings 2011-03-31 11:26:23 -03:00
leds-wrap.c
leds.h leds: support automatic start of blinking with ledtrig-timer 2011-05-25 08:39:49 -07:00
ledtrig-backlight.c leds: add output inversion option to backlight trigger 2011-01-13 08:03:06 -08:00
ledtrig-default-on.c
ledtrig-gpio.c drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking 2011-01-20 17:02:06 -08:00
ledtrig-heartbeat.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ledtrig-ide-disk.c
ledtrig-timer.c drivers/leds/ledtrig-timer.c: fix broken sysfs delay handling 2011-09-14 18:09:38 -07:00
Makefile leds: Renesas TPU LED driver 2011-10-31 17:30:54 -07:00