| /openbmc/linux/Documentation/devicetree/bindings/watchdog/ |
| H A D | twl4030-wdt.txt | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/edac/ |
| H A D | octeon_edac-pci.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| H A D | octeon_edac-l2c.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| H A D | octeon_edac-pc.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| H A D | octeon_edac-lmc.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/mips/mm/ |
| H A D | tlbex-fault.S | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/bcma/ |
| H A D | driver_gmac_cmn.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/Documentation/devicetree/bindings/pinctrl/ |
| H A D | pinctrl-sirf.txt | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/powerpc/include/asm/ |
| H A D | io-workarounds.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/x86/include/asm/ |
| H A D | parport.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/x86/platform/scx200/ |
| H A D | scx200_32.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/arm/mach-omap1/ |
| H A D | fb.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/alpha/include/asm/ |
| H A D | parport.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/iio/common/hid-sensors/ |
| H A D | Makefile | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/gpu/drm/exynos/ |
| H A D | exynos_drm_vidi.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/include/asm-generic/ |
| H A D | parport.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/parisc/include/asm/ |
| H A D | parport.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/ia64/include/asm/ |
| H A D | parport.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| H A D | iosapic.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/mips/pci/ |
| H A D | fixup-rc32434.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/arch/arm/mach-highbank/ |
| H A D | sysregs.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/scsi/mvsas/ |
| H A D | mv_chips.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/include/sound/ |
| H A D | cs4271.h | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/drivers/watchdog/ |
| H A D | da9055_wdt.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| /openbmc/linux/samples/rpmsg/ |
| H A D | rpmsg_client_sample.c | diff 4b87f922598acf91eee18f71688a33f54f57bcde Tue Jan 15 14:05:59 CST 2013 David S. Miller <davem@davemloft.net> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
|