diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 04:46:50 -0400 |
| commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
| tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /Documentation/auxdisplay/cfag12864b | |
| parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 (diff) | |
| parent | 70ff05554f91a1edda1f11684da1dbde09e2feea (diff) | |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/auxdisplay/cfag12864b')
| -rw-r--r-- | Documentation/auxdisplay/cfag12864b | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/auxdisplay/cfag12864b b/Documentation/auxdisplay/cfag12864b index b714183d4125..eb7be393a510 100644 --- a/Documentation/auxdisplay/cfag12864b +++ b/Documentation/auxdisplay/cfag12864b | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | =================================== | 3 | =================================== |
| 4 | 4 | ||
| 5 | License: GPLv2 | 5 | License: GPLv2 |
| 6 | Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com> | 6 | Author & Maintainer: Miguel Ojeda Sandonis |
| 7 | Date: 2006-10-27 | 7 | Date: 2006-10-27 |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -22,7 +22,7 @@ Date: 2006-10-27 | |||
| 22 | 1. DRIVER INFORMATION | 22 | 1. DRIVER INFORMATION |
| 23 | --------------------- | 23 | --------------------- |
| 24 | 24 | ||
| 25 | This driver support one cfag12864b display at time. | 25 | This driver supports a cfag12864b LCD. |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | --------------------- | 28 | --------------------- |