From: Linus Torvalds Date: Thu, 17 Mar 2011 00:21:00 +0000 (-0700) Subject: Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl X-Git-Tag: v2.6.39-rc1~467 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74b9444192c60603020c61d7915b72893137edc;p=pandora-kernel.git Merge branch 'config' of git://git./linux/kernel/git/arnd/bkl * 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl: BKL: That's all, folks fs/locks.c: Remove stale FIXME left over from BKL conversion ipx: remove the BKL appletalk: remove the BKL x25: remove the BKL ufs: remove the BKL hpfs: remove the BKL drivers: remove extraneous includes of smp_lock.h tracing: don't trace the BKL adfs: remove the big kernel lock --- f74b9444192c60603020c61d7915b72893137edc Reading git-diff-tree failed