diff --git a/[refs] b/[refs] index 81011161bcb6..417228ef21e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eb014a103701bedfaa11bc321f470e918c71ff7 +refs/heads/master: 6b9686211374a9751ae70a95fd1fcfb8c2a80698 diff --git a/trunk/CREDITS b/trunk/CREDITS index e71fdce0dc2f..80e241304b8e 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2580,10 +2580,9 @@ S: Australia N: Miguel Ojeda Sandonis E: maxextreme@gmail.com -D: Author: Auxiliary LCD Controller driver (ks0108) -D: Author: Auxiliary LCD driver (cfag12864b) -D: Author: Auxiliary LCD framebuffer driver (cfag12864bfb) -D: Maintainer: Auxiliary display drivers tree (drivers/auxdisplay/*) +W: http://maxextreme.googlepages.com/ +D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. +D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) S: C/ Mieses 20, 9-B S: Valladolid 47009 S: Spain diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index bb0e832c36ff..41901fd95a8c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -679,6 +679,7 @@ AUXILIARY DISPLAY DRIVERS P: Miguel Ojeda Sandonis M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org +W: http://auxdisplay.googlepages.com/ S: Maintained AVR32 ARCHITECTURE @@ -943,12 +944,14 @@ CFAG12864B LCD DRIVER P: Miguel Ojeda Sandonis M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org +W: http://auxdisplay.googlepages.com/ S: Maintained CFAG12864BFB LCD FRAMEBUFFER DRIVER P: Miguel Ojeda Sandonis M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org +W: http://auxdisplay.googlepages.com/ S: Maintained CFG80211 and NL80211 @@ -2096,6 +2099,7 @@ KS0108 LCD CONTROLLER DRIVER P: Miguel Ojeda Sandonis M: maxextreme@gmail.com L: linux-kernel@vger.kernel.org +W: http://auxdisplay.googlepages.com/ S: Maintained LAPB module