Scott Wood 5f867db634 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict ... Commit 66507c7bc8 ("mtd: nand: Add support to use nand_base poi databuf as bounce buffer") added a flag NAND_USE_BOUNCE_BUFFER using the same bit value as the existing NAND_BUSWIDTH_AUTO. Cc: Kamal Dasu <kdasu.kdev@gmail.com> Fixes: 66507c7bc8 ("mtd: nand: Add support to use nand_base poi databuf as bounce buffer") Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>		2015-07-07 13:03:25 -07:00
..
acpi	Additional ACPICA material for v4.2-rc1	2015-07-02 17:11:28 -07:00
asm-generic	- Support for HS38 cores based on ARCv2 ISA	2015-07-01 09:24:26 -07:00
clocksource	ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource	2015-06-02 09:58:18 +01:00
crypto	crypto: rng - Do not free default RNG when it becomes unused	2015-06-22 15:49:18 +08:00
drm	drm: use kvfree() in drm_free_large()	2015-06-30 19:44:59 -07:00
dt-bindings	The changes to the common clock framework for 4.2 are dominated by new	2015-07-01 19:22:00 -07:00
keys
kvm
linux	mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict	2015-07-07 13:03:25 -07:00
math-emu
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2015-07-01 19:09:11 -07:00
memory
misc	cxl: Add AFU virtual PHB and kernel API	2015-06-03 13:27:20 +10:00
net	net: Kill sock->sk_protinfo	2015-06-28 16:55:44 -07:00
pcmcia
ras	tracing: add trace event for memory-failure	2015-06-24 17:49:43 -07:00
rdma	IB/mad: Add final OPA MAD processing	2015-06-12 14:49:18 -04:00
rxrpc
scsi	SCSI misc on 20150622	2015-06-23 15:55:44 -07:00
soc	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00
sound	ASoC: Further updates for v4.2	2015-06-22 11:32:41 +02:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-07-04 14:13:43 -07:00
trace	Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2015-06-30 20:07:45 -07:00
uapi	virtio/vhost: cross endian support	2015-07-03 16:02:25 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-06-26 13:18:51 -07:00
xen
Kbuild