linux-next: manual merge of the bkl-ioctl tree with the bkl-procfstree

[Stephen Rothwell]

Hi FrÃdÃric,

Today's linux-next merge of the bkl-ioctl tree got conflicts in
drivers/char/i8k.c, net/sunrpc/cache.c and
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.

I used the versions from the bkl-procfs tree for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature