Merge branch 'master' into next

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 7d30ee1d3fca..04e4549299ba 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -7,12 +7,14 @@
  *      Original driver code supplied by Multi-Tech
  *
  *      Changes
- *      1/9/98  alan@redhat.com         Merge to 2.0.x kernel tree
+ *      1/9/98  alan@lxorguk.ukuu.org.uk
+ *                                      Merge to 2.0.x kernel tree
  *                                      Obtain and use official major/minors
  *                                      Loader switched to a misc device
  *                                      (fixed range check bug as a side effect)
  *                                      Printk clean up
- *      9/12/98 alan@redhat.com         Rough port to 2.1.x
+ *      9/12/98 alan@lxorguk.ukuu.org.uk
+ *                                      Rough port to 2.1.x
  *
  *      10/6/99 sameer                  Merged the ISA and PCI drivers to
  *                                      a new unified driver.