The following changes since commit 929f393f76d2037905ebcea77247b43a6fe6b9d8:
Leann Ogasawara (1):
UBUNTU: Ubuntu-2.6.35-3.4

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-maverick.git lp440522-NFS-FSCACHE

Tim Gardner (2):
UBUNTU: [Config] CONFIG_NFS_FSCACHE=y
UBUNTU: [Config] CONFIG_FSCACHE_STATS=y, CONFIG_FSCACHE_HISTOGRAM=y

debian.master/config/config.common.ports | 6 +++---
debian.master/config/config.common.ubuntu | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
From fd3f8cda0c5279082f21f7ac11ab732dcbd73a6d Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 15 Jun 2010 15:04:06 -0600
Subject: [PATCH 1/2] UBUNTU: [Config] CONFIG_NFS_FSCACHE=y

BugLink: http://bugs.launchpad.net/bugs/440522

This feature is no longer marked experimental.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/config/config.common.ports | 2 +-
debian.master/config/config.common.ubuntu | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index c4fcb68..0b9ded9 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -2328,7 +2328,7 @@ CONFIG_NFSD_V4=y
CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_NFS_FS=m
-# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_FSCACHE=y
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1b46e3c..e9333f0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2918,7 +2918,7 @@ CONFIG_NFSD_V4=y
CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_NFS_FS=m
-# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_FSCACHE=y
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
--
1.7.0.4