Staging: Merge 2.6.37-rc5 into staging-next

This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 0 insertions, 1 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d9f51485bee..9383063d2b1 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -349,7 +349,6 @@ static struct irq_chip dino_interrupt_type = {
         .name   = "GSC-PCI",
         .unmask = dino_unmask_irq,
         .mask   = dino_mask_irq,
-        .ack    = no_ack_irq,
 };