diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-03-18 19:02:58 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-18 19:02:58 -0700 |
| commit | 441a499e5a5bf7b65ca557abd5ffc64b509dca65 (patch) | |
| tree | 4ea91d43d10521b466e8ea19db3b5e498e7c07fd /include/asm-generic/unistd.h | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| parent | b09f86dbfc20d9420dac43dba016cb65b582c983 (diff) | |
| download | blackbird-op-linux-441a499e5a5bf7b65ca557abd5ffc64b509dca65.tar.gz blackbird-op-linux-441a499e5a5bf7b65ca557abd5ffc64b509dca65.zip | |
Merge branch 'for-mfd-and-power' of git://git.linaro.org/people/ljones/linux-3.0-ux500
From Lee Jones <lee.jones@linaro.org>:
"Please find the next instalment of the AB8500 Power drivers upgrade. A lot of
work has taken place on the internal development track, but little effort has
gone into mainlining it. There is a large backlog of patches which are in need
of forward-porting, then upstreaming. This patch-set aims to make a large dent
into them."
Conflicts:
drivers/mfd/ab8500-gpadc.c
Diffstat (limited to 'include/asm-generic/unistd.h')
0 files changed, 0 insertions, 0 deletions
