diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /Documentation/auxdisplay/cfag12864b | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
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 | --------------------- |