aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/feat.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-31 14:31:44 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-31 14:31:44 -1000
commit3da3f872aa175f59e20766ed30aaea67fd4fa7d1 (patch)
treea44697edf5eebd02b6f159a7ab824a45730134b4 /net/dccp/feat.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k (diff)
parentmfd: Fix mismatch in twl4030 mutex lock-unlock (diff)
downloadlinux-dev-3da3f872aa175f59e20766ed30aaea67fd4fa7d1.tar.xz
linux-dev-3da3f872aa175f59e20766ed30aaea67fd4fa7d1.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: (46 commits) mfd: Fix mismatch in twl4030 mutex lock-unlock mfd: twl6030-pwm.c needs MODULE_LICENSE mfd: Fix the omap-usb-host clock API usage on usbhs_disable() mfd: Acknowledge WM8994 IRQs before reporting mfd: Acknowlege all WM831x IRQs before we handle them mfd: Avoid two assignments if failures happen in tps65910_i2c_probe regulator: Storing tps65912 error codes in u8 mfd: Don't leak init_data in tps65910_i2c_probe regulator: aat2870: Add AAT2870 regulator driver backlight: Add AAT2870 backlight driver mfd: Add AAT2870 mfd driver mfd: Remove dead code from max8997-irq mfd: Move TPS55910 Kconfig option mfd: Fix missing stmpe kerneldoc mfd: Fix off-by-one value range checking for tps65912_i2c_write mfd: Add devices for WM831x clocking module mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove mfd: Don't ask about the TPS65912 core driver in Kconfig mfd: Fix off by one in WM831x IRQ code mfd: Add tps65921 support from twl-core ...
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions