[LV-k25-commit] Linux for the VAX architecture: Changes to 'getuptodate'

[Jan-Benedict G. <jb...@he...>]

 drivers/net/b44.c              |    5 +++--
 drivers/net/e1000/e1000_main.c |    7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d818257d62d30ab549477d1cba5db1767fa69a56
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d818257d62d30ab549477d1cba5db1767fa69a56
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d818257d62d30ab549477d1cba5db1767fa69a56
Merge: 0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d edd106fc8ac1826dbe231b70ce0762db24133e5c
Author: Jan-Benedict Glaw <jb...@d2...>
Date:   Tue Nov 7 23:41:11 2006 +0100

    Merge branch 'master' into getuptodate

commit edd106fc8ac1826dbe231b70ce0762db24133e5c
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=edd106fc8ac1826dbe231b70ce0762db24133e5c
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=edd106fc8ac1826dbe231b70ce0762db24133e5c
Author: Auke Kok <auk...@in...>
Date:   Mon Nov 6 08:57:12 2006 -0800

    [PATCH] e1000: Fix regression: garbled stats and irq allocation during swsusp
    
    e1000: Fix suspend/resume powerup and irq allocation
    
    From: Auke Kok <auk...@in...>
    
    After 7.0.33/2.6.16, e1000 suspend/resume left the user with an enabled
    device showing garbled statistics and undetermined irq allocation state,
    where `ifconfig eth0 down` would display `trying to free already freed irq`.
    
    Explicitly free and allocate irq as well as powerup the PHY during resume
    fixes when needed.
    
    Signed-off-by: Auke Kok <auk...@in...>
    Signed-off-by: Jeff Garzik <je...@ga...>

commit e78181feb0b94fb6afeaef3b28d4f5df1b847c98
gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e78181feb0b94fb6afeaef3b28d4f5df1b847c98
gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e78181feb0b94fb6afeaef3b28d4f5df1b847c98
Author: Johannes Berg <joh...@si...>
Date:   Mon Nov 6 23:17:20 2006 +0100

    [PATCH] b44: change comment about irq mask register
    
    Through some experimentation with the similarly built bcm43xx I came to
    the conclusion that if the hw/firmware sets a bit in the interrupt
    register, an interrupt will only be raised if that bit is included in
    the interrupt mask. Hence, the interrupt mask is more like an interrupt
    control mask.
    
    This patch changes the comment to reflect that.
    
    Signed-off-by: Johannes Berg <joh...@si...>
    Signed-off-by: Jeff Garzik <je...@ga...>