hwrng: fix spelling mistake in header comment

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
clocksource: tile: convert to use clocksource_register_hz

Convert tile to use clocksource_register_hz.

CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
tile: use generic-y format for one-line asm-generic headers

This lets us remove a lot of one-line wrapper header files.
See commit d8ecc5cd8e227bc318513b5306ae88a474b8886d for context.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
doc: i2o: fix typo 'Settting'

The below patch fixes a typo "Settting" to "Setting".

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Merge branch 'master' into for-next

Sync with Linus' tree to be able to apply patches against new
code I have in queue.
ioctl-number.txt: add the tile hardwall ioctl range

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
arch/tile: add hypervisor-based character driver for SPI flash ROM

The first version of this patch proposed an arch/tile/drivers/ directory,
but the consensus was that this was probably a poor choice for a place to
group Tilera-specific drivers, and that in any case grouping by platform
was discouraged, and grouping by function was preferred.

This version of the patch addresses various issues raised in the
community, primarily the absence of sysfs integration.  The sysfs
integration now handles passing information on sector size, page size,
and total partition size to userspace as well.  In addition, we now
use a single "struct cdev" to manage all the partition minor devices,
and dynamically discover the correct number of partitions from the
hypervisor rather than using a module_param with a default value.

This driver has no particular "peer" drivers it can be grouped with.
It is sort of like an MTD driver for SPI ROM, but it doesn't group well
with the other MTD devices since it relies on hypervisor virtualization
to handle many of the irritating aspects of flash ROM management: sector
awareness, background read for sub-sector writes, bit examination to
determine whether a sector erase needs to be issued, etc.  It is in fact
more like an EEPROM driver, but the hypervisor virtualization does require
a "flush" command if you wish to commit a sector write prior to writing
to a different sector, and this is sufficiently different from generic
I2C/SPI EEPROMs that as a result it doesn't group well with them either.

The simple character device is already in use by a range of Tilera
SPI ROM management tools, as well as by customers.  In addition, using
the simple character device actually simplifies the userspace tools,
since they don't need to manage sector erase, background read, etc.
This both simplifies the code (since we can uniformly manage plain files
and the SPI ROM) as well as makes the user code portable to non-Linux
platforms that don't offer the same MTD ioctls.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
Upstream samsung crap
Merge commit '5be5758c114b18260c6fd4c8373bf89e39b0fe82' into m0-up
Merge commit '93ea927eb15b736fa4a431f789b1097318129d2a' into m0-up

Conflicts:
	arch/tile/include/asm/Kbuild
	arch/tile/kernel/time.c
	drivers/char/Kconfig
	drivers/char/Makefile
Merge commit 'c48b1f729a75880d0895f0b23efaf551ee800a35' into m0-up

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c