From: David Woodhouse Date: Sat, 29 Sep 2012 14:37:03 +0000 (+0100) Subject: Merge commit '371a00448f95adaa612cf1a0b31a11e7093bc706' of 'git://git.kernel.org... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6997af7cee305bb9fc77260e84de94bfd486f7af;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge commit '371a00448f95adaa612cf1a0b31a11e7093bc706' of 'git://git./linux/kernel/git/davem/net-next.git' We need the following 2 patches from the 'net-next' tree for the BCMA flash driver: 371a004 bcma: detect and register NAND flash device d57ef3a bcma: detect and register serial flash device and this is why we are merging the net-next tree (presumably persistent) up to commit '371a004'. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- 6997af7cee305bb9fc77260e84de94bfd486f7af