Linus Torvalds 45175476ae A couple of fixes and clean-ups, allow for assigning user-defined ... UBI device numbers when attaching MTD devices by using the "mtd=" module parameter. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJR1t2RAAoJECmIfjd9wqK0bYIQALppqcFo27hkiCVcBHHjMRCw UonQBsD0GNXTyzrr/a+lBPK/33DgkiQ+/SHA/1ZXWPdBAwsacWBwzFtNo8OvC8Pg L0VPLY3OD5WOnbU8l9HzhjYm3MBrwvWqUmtzfM93c506tacR7z4j22uuF2jeBtDS qvVNeiVwYRjHdSrODd0IP16RqNGg2BHJ3FM+Eek9c+cGpkxUUzCRohugzFidrSVQ qNgptNGuWtpkAE3ytOGmmPXBSDQEFSUpjg6U6pZwQ3A5e4lKR7QqCC0bEf1S1uPc 9pqmY21SC/fIm2VMN5jl+276mlwAOgsVI4+X7tK8ccrHzvkdoEwiMuqo0TwIMiPt PrhGjWBdGqDb8pvLvUSuzKUraVcOW7m1jE60sTLtq5xIkUd7CbBIq6n5o3oIdeW8 jOCy9+Bkae45l8WKtQlBd+GHw8bDfgsxFt0qQ2UOGdu4+km09VsEzT6SDx3ZfsBM fJZzBm2qw02ZwtfzCI3FzzS4CJnDWlq20gbyf0B9a1aBMtN/HffbtyIFop4Nrlb2 TlFjh/kFRNkNf0gXrGz5AvM5jhOR3tkh9Jtz1LsLaqRVkTsfsKUt1PvP4pUFAbvB FIaqSVUz9+ri/CyNpFYe2ofLHqFBMukygaqPU8JpMlo4i6kI2aO7XlRqQz62hSlu mFROtIxWeHhQJwxtJ3UC =N5BA -----END PGP SIGNATURE----- Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi Pull ubi fixes from Artem Bityutskiy: "A couple of fixes and clean-ups, allow for assigning user-defined UBI device numbers when attaching MTD devices by using the "mtd=" module parameter" * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi: UBI: support ubi_num on mtd.ubi command line UBI: fastmap break out of used PEB search UBI: document UBI_IOCVOLUP better in user header UBI: do not abort init when ubi.mtd devices cannot be found UBI: drop redundant "UBI error" string		2013-07-05 12:09:48 -07:00
..
acpi	PCI changes for the v3.11 merge window:	2013-07-03 16:31:35 -07:00
asm-generic	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-07-04 10:29:23 -07:00
clocksource	clocksource: arch_timer: use virtual counters	2013-06-07 10:20:28 +01:00
crypto
drm	Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux	2013-05-21 08:50:57 -07:00
dt-bindings	Pin control changes for the v3.11 kernel cycle:	2013-07-03 11:48:03 -07:00
keys
kvm	ARM: KVM: Allow host virt timer irq to be different from guest timer virt irq	2013-06-26 10:50:02 -07:00
linux	Device tree updates for v3.11	2013-07-04 15:51:45 -07:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-06-18 06:25:08 -10:00
memory
misc
net	ip_tunnel: remove __net_init/exit from exported functions	2013-06-13 03:00:59 -07:00
pcmcia
ras
rdma
rxrpc
scsi	[SCSI] libiscsi: Added new boot entries in the session sysfs	2013-06-26 18:04:11 -07:00
sound	ASoC: More updates for v3.11	2013-06-28 13:36:22 +02:00
target	target: Propigate up ->cmd_kref put return via transport_generic_free_cmd	2013-05-31 01:21:23 -07:00
trace	Merge branch 'akpm' (updates from Andrew Morton)	2013-07-03 17:12:13 -07:00
uapi	A couple of fixes and clean-ups, allow for assigning user-defined	2013-07-05 12:09:48 -07:00
video	Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes	2013-05-29 17:00:34 +08:00
xen	Power management and ACPI updates for 3.11-rc1	2013-07-03 14:35:40 -07:00
Kbuild