Hauke Mehrtens
e661b75a44
bcma: mark nflash if it is the boot flash ...
There are some devices which are able to boot from nand flash and other
are using a serial flash for booting. Add a bool to indicate that the
device is booted from that flash chip and not from some other chip also
connected to the SoC. This is needed to find the nvram, as it is stored
on the flash the devices booted from.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2012-10-19 15:52:37 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-08 07:14:06 +09:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-10-14 14:39:05 -07:00
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-14 13:39:34 -07:00
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
2012-10-07 21:13:54 +10:00
KEYS: Asymmetric key pluggable data parsers
2012-10-08 13:50:13 +10:30
bcma: mark nflash if it is the boot flash
2012-10-19 15:52:37 -04:00
Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next
2012-10-07 21:06:33 +10:00
UAPI: (Scripted) Disintegrate include/mtd
2012-10-09 09:49:09 +01:00
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2012-10-19 15:36:53 -04:00
infiniband: pass rdma_cm module to netlink_dump_start
2012-10-07 00:30:56 -04:00
SCSI misc on 20121012
2012-10-13 10:57:01 +09:00
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2012-10-10 10:49:20 +09:00
nl/cfg80211: force scan using an AP vif if requested
2012-10-18 17:21:22 +02:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
UAPI Disintegration 2012-10-09
2012-10-13 11:14:29 +09:00
e661b75a44