Merge branch 'master' into for-next

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 3232206406b1..7446d8b4282d 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -392,6 +392,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 if (dev) {
                         struct mISDN_devinfo di;
 
+                        memset(&di, 0, sizeof(di));
                         di.id = dev->id;
                         di.Dprotocols = dev->Dprotocols;
                         di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
@@ -672,6 +673,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 if (dev) {
                         struct mISDN_devinfo di;
 
+                        memset(&di, 0, sizeof(di));
                         di.id = dev->id;
                         di.Dprotocols = dev->Dprotocols;
                         di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();