aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2011-09-05 17:26:46 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:27 -0700
commit278b9d9249a98e09f9e0d76e965e78f9634a6c3e (patch)
tree906b671cc3b65e325fdac72fde339807295123ec /debian.master
parent536d8f05dc71e387bbad3cd0161dd0671c380537 (diff)
downloadlinux-linaro-precise-278b9d9249a98e09f9e0d76e965e78f9634a6c3e.tar.gz
UBUNTU: rebase to v3.1-rc5
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian.master/changelog b/debian.master/changelog
index cafa40832cf..4a1887e7caf 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -13,6 +13,7 @@ linux (3.1.0-1.1) UNRELEASED; urgency=low
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
* rebase to v3.1-rc4
+ * rebase to v3.1-rc5
-- Leann Ogasawara <leann.ogasawara@canonical.com> Wed, 10 Aug 2011 15:43:38 -0700