diff --git a/[refs] b/[refs] index 3409ab5e3362..9b913a79798b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad092338350e517608a41341095b6b1e312c4eb1 +refs/heads/master: 69539ab1006f6c55cc5243fa82341bb6e59c07ed diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 3321d75c6c7f..95e4e43a12b4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2845,6 +2845,12 @@ S: Maintained F: drivers/media/video/m5mols/ F: include/media/m5mols.h +FUJITSU TABLET EXTRAS +M: Robert Gerlach +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/platform/x86/fujitsu-tablet.c + FUSE: FILESYSTEM IN USERSPACE M: Miklos Szeredi L: fuse-devel@lists.sourceforge.net diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c index 068b754bc348..8aea3a2dd889 100644 --- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c +++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c @@ -38,6 +38,7 @@ #include #include #include +#include #include