linux-next: manual merge of the moduleh tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Paul,

I also dropped the following already applied patches:

wireless-ath6kl-use-of-module_param-requires-the-inc.patch
staging-add-module.h-to-various-iio-drivers.patch

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpySMgLMG4Ar.pgp
Description: PGP signature