summaryrefslogtreecommitdiff
path: root/drivers/net/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-02 04:05:46 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-02 04:05:46 +0400
commitcfe22345ad5ef29e192e157fdc3e17d357e4bc24 (patch)
tree15173bab84cb9122a95d46f2b49fb139362b5248 /drivers/net/bnx2x/bnx2x_main.c
parent60ad4466821a96913a9b567115e194ed1087c2d7 (diff)
parent424c3d4a2c7d4ac3467a4849f8ccc230f670c35a (diff)
downloadlinux-cfe22345ad5ef29e192e157fdc3e17d357e4bc24.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (23 commits) regulator: Improve WM831x DVS VSEL selection algorithm regulator: Bootstrap wm831x DVS VSEL value from ON VSEL if not already set regulator: Set up GPIO for WM831x VSEL before enabling VSEL mode regulator: Add EPEs to the MODULE_ALIAS() for wm831x-dcdc regulator: Fix WM831x DCDC DVS VSEL bootstrapping regulator: Fix WM831x regulator ID lookups for multiple WM831xs regulator: Fix argument format type errors in error prints regulator: Fix memory leak in set_machine_constraints() error paths regulator: Make core more chatty about some errors regulator: tps65910: Fix array access out of bounds bug regulator: tps65910: Add missing breaks in switch/case regulator: tps65910: Fix a memory leak in tps65910_probe error path regulator: TWL: Remove entry of RES_ID for 6030 macros ASoC: tlv320aic3x: Add correct hw registers to Line1 cross connect muxes regulator: Add basic per consumer debugfs regulator: Add rdev_crit() macro regulator: Refactor supply implementation to work as regular consumers regulator: Include the device name in the microamps_requested_ file regulator: Increase the limit on sysfs file names regulator: Properly register dummy regulator driver ...
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_main.c')
0 files changed, 0 insertions, 0 deletions