Merge branch 'master' into v2.6.31-branch
authorJeff Mahoney <jeffm@suse.de>
Thu, 16 Jul 2009 14:27:46 +0000 (10:27 -0400)
committerJeff Mahoney <jeffm@suse.de>
Thu, 16 Jul 2009 15:03:19 +0000 (11:03 -0400)
commit47f125b4c0c05bd632e55aed98e5c566d9f663e6
tree72eaa721b178802baf4537fec43afce4c2e5fd84
parent0ae0db730fa931fa51c927f126fe4e79b6dae206
parenta88ccb60a44cdb41c19e95e9f1b98aa576359384
Merge branch 'master' into v2.6.31-branch

Conflicts:
patches.suse/e1000e_allow_bad_checksum
patches.suse/e1000e_call_dump_eeprom
patches.suse/e1000e_use_set_memory_ro-rw_to_protect_flash_memory

suse-commit: 185ab7e09f1d0f819ed294f255d28d9030b9e265
.gitignore
Makefile
drivers/net/e1000e/e1000.h
drivers/net/e1000e/hw.h
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
scripts/Makefile.build
scripts/Makefile.lib
scripts/kconfig/confdata.c
scripts/mod/modpost.c