Merge remote-tracking branch 'random/dev'

Conflicts:
	drivers/mfd/ab3100-core.c
	drivers/usb/gadget/omap_udc.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap1/board-palmz71.c
Simple merge

diff --cc arch/um/drivers/line.c
Simple merge

diff --cc arch/um/drivers/mconsole_kern.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/mfd/ab3100-core.c
index 4276aab4f1963bcc34eaceb94c5018e345b72a82,1287645b984da03b5106fae3a4201baebfb36e55..78fca2902c8da38fd07660e381e8ed55c0d78c2d
--- 1/drivers/mfd/ab3100-core.c
--- 2/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@@ -931,13 -929,10 +929,11 @@@ static int __devinit ab3100_probe(struc
        if (err)
                goto exit_no_setup;
  
 -      err = request_threaded_irq(client->irq, NULL, ab3100_irq_handler,
 -                              IRQF_ONESHOT, "ab3100-core", ab3100);
 +      err = devm_request_threaded_irq(&client->dev,
 +                                      client->irq, NULL, ab3100_irq_handler,
 +                                      IRQF_ONESHOT, "ab3100-core", ab3100);
        if (err)
                goto exit_no_irq;
-       /* This real unpredictable IRQ is of course sampled for entropy */
-       rand_initialize_irq(client->irq);
  
        err = abx500_register_ops(&client->dev, &ab3100_ops);
        if (err)

diff --cc drivers/power/pda_power.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/usb/gadget/pxa25x_udc.c
Simple merge

diff --cc drivers/usb/otg/isp1301_omap.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge