diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
| commit | 8e49fbd70c5888996be433512ab44666af708a23 (patch) | |
| tree | f7ee567bd8e35a785992c18c80883b5b6570b3d4 /drivers/staging/xgifb/TODO | |
| parent | a07527daf4b80514fb8b898f073c843187e47f80 (diff) | |
| parent | 135e44aaa47c22b66c8d2acb54da1106a6c17598 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'drivers/staging/xgifb/TODO')
| -rw-r--r-- | drivers/staging/xgifb/TODO | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/TODO b/drivers/staging/xgifb/TODO index 7d71019b84c2..c85ff5e9e700 100644 --- a/drivers/staging/xgifb/TODO +++ b/drivers/staging/xgifb/TODO @@ -12,4 +12,4 @@ TODO: - get rid of non-linux related stuff Please send patches to: -Arnaud Patard <apatard@mandriva.com> +Arnaud Patard <arnaud.patard@rtp-net.org> |