Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: Support additional parent IDs for wm831x
  mfd: Fix ab8500-core interrupt ffs bit bug
  mfd: Supply IRQ base for WM832x devices
  watchdog: Fix null pointer dereference while accessing rdc321x platform_data
  gpio: Fix null pointer dereference while accessing rdc321x platform_data

...

This commit is contained in:

Linus Torvalds 2010-12-22 19:47:04 -08:00

parent 97dbf37d89 b93cef5561

commit ca5f73a05e

4 changed files with 9 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpio/rdc321x-gpio.c

View file

2

drivers/mfd/ab8500-core.c

View file

8

drivers/mfd/wm831x-core.c

View file

2

drivers/watchdog/rdc321x_wdt.c

View file