From: David Woodhouse Date: Fri, 26 Feb 2010 19:04:15 +0000 (+0000) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~21963^2~89 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a7790532f5b7358c33a6b1834dc2b318de209f31;p=mirror_ubuntu-artful-kernel.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 The SmartMedia FTL code depends on new kfifo bits from 2.6.33 --- a7790532f5b7358c33a6b1834dc2b318de209f31