diff options
| author | Robert Hodaszi <robert.hodaszi@digi.com> | 2011-05-23 14:28:03 +0200 |
|---|---|---|
| committer | Hector Palacios <hector.palacios@digi.com> | 2011-09-01 10:36:33 +0200 |
| commit | 5ea5e14ba2919ce14bd7d8f5f6f202b04e502517 (patch) | |
| tree | 7d50a00b1e64a9eff0fffc3f924b408f83a253ce /drivers/video/sgivwfb.c | |
| parent | af0c7f7ef6061906932b9664b499725ede2c4262 (diff) | |
merge: merged changes from 2.6.28
Conflicts: gpio
Special handling of PORT A gpios is lost.
Some code has been ported but it must be fixed.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Signed-off-by: Robert Hodaszi <robert.hodaszi@digi.com>
Diffstat (limited to 'drivers/video/sgivwfb.c')
0 files changed, 0 insertions, 0 deletions