diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 10:02:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 10:02:35 -0800 |
commit | 76b8f82cde2d9c13ef0c9a9aa2581b9b30b68e8c (patch) | |
tree | f94b370b95051b4a7b3c272b4b2ee20091e1b746 /arch/microblaze/include/asm/sockios.h | |
parent | af853e631db12a97363c8c3b727d153bd2cb346b (diff) | |
parent | 9da66539281b5e15afc4a4739014c8923059d894 (diff) | |
download | linux-3.10-76b8f82cde2d9c13ef0c9a9aa2581b9b30b68e8c.tar.gz linux-3.10-76b8f82cde2d9c13ef0c9a9aa2581b9b30b68e8c.tar.bz2 linux-3.10-76b8f82cde2d9c13ef0c9a9aa2581b9b30b68e8c.zip |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (58 commits)
mfd: Add twl6030 regulator subdevices
regulator: Add support for twl6030 regulators
rtc: Add twl6030 RTC support
mfd: Add support for twl6030 irq framework
mfd: Rename twl4030_ routines in twl-regulator.c
mfd: Rename twl4030_ routines in rtc-twl.c
mfd: Rename all twl4030_i2c*
mfd: Rename twl4030* driver files to enable re-use
mfd: Clarify twl4030 return value for read and write
mfd: Add all twl4030 regulators to the twl4030 mfd driver
mfd: Don't set mc13783 ADREFMODE for touch conversions
mfd: Remove ezx-pcap defines for custom led gpio encoding
mfd: Near complete mc13783 rewrite
mfd: Remove build time warning for WM835x register default tables
mfd: Force I2C to be built in when building WM831x
mfd: Don't allow wm831x to be built as a module
mfd: Fix incorrect error check for wm8350-core
mfd: Fix twl4030 warning
gpiolib: Implement gpio_to_irq() for wm831x
mfd: Remove default selection of AB4500
...
Diffstat (limited to 'arch/microblaze/include/asm/sockios.h')
0 files changed, 0 insertions, 0 deletions