diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-04 16:12:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-04 16:12:34 +1100 |
| commit | 331b3b2541d8539039f253cd52c4e5eb29363926 (patch) | |
| tree | ab395e3d7a30a4a51ac8860f2ee6b5705b8db81c /fs | |
| parent | c026222fa41c929f560b4058b55bb63b3b340353 (diff) | |
| parent | 0731572b6c529f8e8a320dc4df6d67d9a595ecf3 (diff) | |
Merge remote-tracking branch 'char-misc/char-misc-next'
Conflicts:
drivers/ipack/devices/ipoctal.c
drivers/mfd/wm5102-tables.c
include/linux/mfd/arizona/pdata.h
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions