kernel_optimize_test/drivers/misc
Linus Torvalds 9ec97169e7 Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
Pull PWM subsystem from Thierry Reding:
 "The new PWM subsystem aims at collecting all implementations of the
  legacy PWM API and to eventually replace it completely.

  The subsystem has been in development for over half a year now and
  many drivers have already been converted.  It has been in linux-next
  for a couple of weeks and there have been no major issues so I think
  it is ready for inclusion in your tree."

Arnd Bergmann <arnd@arndb.de>:
 "Very much Ack on the new subsystem.  It uses the interface
  declarations as the previously separate pwm drivers, so nothing
  changes for now in the drivers using it, although it enables us to
  change those more easily in the future if we want to.

  This work is also one of the missing pieces that are required to
  eventually build ARM kernels for multiple platforms, which is
  currently prohibited (amongs other things) by the fact that you cannot
  have more than one driver exporting the pwm functions."

Tested-and-acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Philip, Avinash <avinashphilip@ti.com> # TI's AM33xx platforms
Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com> # LPC32XX
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>

Fix up trivial conflicts with other cleanups and DT updates.

* 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm: (36 commits)
  pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
  pwm: pwm-tiecap: PWM driver support for ECAP APWM
  pwm: fix used-uninitialized warning in pwm_get()
  pwm: add lpc32xx PWM support
  pwm_backlight: pass correct brightness to callback
  pwm: Use pr_* functions in pwm-samsung.c file
  pwm: Convert pwm-samsung to use devm_* APIs
  pwm: Convert pwm-tegra to use devm_clk_get()
  pwm: pwm-mxs: Return proper error if pwmchip_remove() fails
  pwm: pwm-bfin: Return proper error if pwmchip_remove() fails
  pwm: pxa: Propagate pwmchip_remove() error
  pwm: Convert pwm-pxa to use devm_* APIs
  pwm: Convert pwm-vt8500 to use devm_* APIs
  pwm: Convert pwm-imx to use devm_* APIs
  pwm: Conflict with legacy PWM API
  pwm: pwm-mxs: add pinctrl support
  pwm: pwm-mxs: use devm_* managed functions
  pwm: pwm-mxs: use global reset function stmp_reset_block
  pwm: pwm-mxs: encode soc name in compatible string
  pwm: Take over maintainership of the PWM subsystem
  ...
2012-07-30 09:22:37 -07:00
..
altera-stapl
c2port c2port: fix bogus Kconfig "default no" 2012-05-07 15:00:19 +02:00
carma Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2012-03-21 18:55:10 -07:00
cb710 PCI: do not call pci_set_power_state with PCI_D3cold 2012-06-23 10:50:44 -06:00
eeprom misc: at25: Parse dt settings 2012-06-14 17:23:04 -07:00
ibmasm simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
lis3lv02d
mei mei: use module_pci_driver 2012-07-19 15:33:30 -07:00
sgi-gru Add #includes needed to permit the removal of asm/system.h 2012-03-28 18:30:03 +01:00
sgi-xp sgi-xp: nested calls to spin_lock_irqsave() 2012-07-11 16:04:47 -07:00
ti-st
ab8500-pwm.c mfd: Enable Device Tree support in the ab8500-pwm driver 2012-05-20 17:27:13 +02:00
ad525x_dpot-i2c.c
ad525x_dpot-spi.c
ad525x_dpot.c misc: do not mark exported functions __devexit 2012-04-18 14:54:31 -07:00
ad525x_dpot.h
apds990x.c
apds9802als.c
arm-charlcd.c
atmel_pwm.c
atmel_tclib.c
atmel-ssc.c
bh1770glc.c
bh1780gli.c misc: add missing __devexit_p() annotations 2012-04-18 14:54:31 -07:00
bmp085-i2c.c misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
bmp085-spi.c misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
bmp085.c misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
bmp085.h misc: add support for bmp18x chips to the bmp085 driver 2012-04-18 14:57:14 -07:00
cs5535-mfgpt.c
ds1682.c
enclosure.c
ep93xx_pwm.c
fsa9480.c
hmc6352.c
hpilo.c misc: hpilo: increase number of max supported channels 2012-06-14 17:22:12 -07:00
hpilo.h misc: hpilo: increase number of max supported channels 2012-06-14 17:22:12 -07:00
ics932s401.c
ioc4.c
isl29003.c
isl29020.c
Kconfig Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
kgdbts.c x86,kgdb: Fix DEBUG_RODATA limitation using text_poke() 2012-03-29 17:41:25 -05:00
lkdtm.c
Makefile iwmc3200top: remove driver for unavailable hardware 2012-07-11 15:40:22 -04:00
pch_phub.c pch_phub: delete duplicate definitions 2012-04-18 14:53:51 -07:00
phantom.c
pti.c misc: add missing __devexit_p() annotations 2012-04-18 14:54:31 -07:00
spear13xx_pcie_gadget.c
ti_dac7512.c
tifm_7xx1.c
tifm_core.c
tsl2550.c
vmw_balloon.c