torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-29 10:47:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
5300fdcb7b7e97d83033bc7196582705524d35ea
linux/drivers
History
Andreas Ruprecht 3b3e0ea8bc net: ethernet: ibm: ehea: Remove duplicate object from Makefile 
In the Makefile, ehea_phyp.o is included twice in the list of
object files compile into ehea.o.

This change removes one instance.

Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-14 14:38:54 -07:00
..
accessibility
…
acpi
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-13 18:23:32 -06:00
amba
…
ata
Merge branch 'akpm' (patchbomb from Andrew Morton)
2014-08-06 21:14:42 -07:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-08-13 18:27:40 -06:00
auxdisplay
…
base
Merge branch 'akpm' (patchbomb from Andrew Morton)
2014-08-06 21:14:42 -07:00
bcma
bcma: use NS prefix for names of Northstar specific cores
2014-07-31 13:45:32 -04:00
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-08-13 17:43:29 -06:00
bluetooth
Bluetooth: Fix crash in the Marvell driver initialization codepath
2014-07-31 01:07:28 +02:00
bus
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
cdrom
…
char
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2014-08-10 21:31:04 -07:00
clk
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
clocksource
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
connector
…
cpufreq
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
cpuidle
ARM: EXYNOS: Fix suspend/resume sequences
2014-08-09 08:24:36 -07:00
crypto
crypto: use pci_zalloc_consistent
2014-08-08 15:57:28 -07:00
dca
…
devfreq
…
dio
…
dma
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
dma-buf
…
edac
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-04 17:21:59 -07:00
eisa
…
extcon
…
firewire
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
firmware
kexec: support kexec/kdump on EFI systems
2014-08-08 15:57:33 -07:00
fmc
…
gpio
Merge tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2014-08-08 18:00:35 -07:00
gpu
Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
2014-08-09 17:46:39 -07:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-08 17:39:48 -07:00
hsi
Merge tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
2014-08-06 20:06:14 -07:00
hv
Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-08-04 17:32:24 -07:00
hwmon
fs.h, drivers/hwmon/asus_atk0110.c: fix DEFINE_SIMPLE_ATTRIBUTE semicolon definition and use
2014-08-06 18:01:23 -07:00
hwspinlock
…
i2c
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
ide
ide: use module_platform_driver()
2014-08-05 21:16:46 -07:00
idle
…
iio
Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
2014-08-04 18:36:12 -07:00
infiniband
infiniband: use pci_zalloc_consistent
2014-08-08 15:57:28 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-08 17:39:48 -07:00
iommu
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:00:26 -07:00
ipack
…
irqchip
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
isdn
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
leds
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
lguest
mm/vmalloc.c: clean up map_vm_area third argument
2014-08-06 18:01:19 -07:00
macintosh
Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
2014-08-07 17:23:16 -07:00
mailbox
…
mcb
…
md
Merge tag 'md/3.17' of git://neil.brown.name/md
2014-08-11 07:02:35 -07:00
media
media: use pci_zalloc_consistent
2014-08-08 15:57:28 -07:00
memory
…
memstick
…
message
…
mfd
Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2014-08-07 17:17:39 -07:00
misc
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
mmc
Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2014-08-07 17:17:39 -07:00
mtd
Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs
2014-08-13 17:42:11 -06:00
net
net: ethernet: ibm: ehea: Remove duplicate object from Makefile
2014-08-14 14:38:54 -07:00
nfc
…
ntb
…
nubus
…
of
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:46:42 -07:00
oprofile
…
parisc
…
parport
drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO
2014-08-08 15:57:25 -07:00
pci
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
pcmcia
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-08-07 08:50:34 -07:00
phy
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
pinctrl
Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:34:32 -07:00
platform
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
2014-08-10 11:13:58 -07:00
pnp
…
power
Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:14:29 -07:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
Merge tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2014-08-08 18:06:29 -07:00
rapidio
rapidio/tsi721_dma: rework scatter-gather list handling
2014-08-08 15:57:24 -07:00
ras
…
regulator
Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2014-08-07 17:17:39 -07:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge branch 'akpm' (second patchbomb from Andrew Morton)
2014-08-08 15:57:47 -07:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-08-07 08:41:00 -07:00
sbus
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2014-08-05 18:57:18 -07:00
scsi
libcxgbi/cxgb4i : Fix ipv6 build failure caught with randconfig
2014-08-13 20:04:47 -07:00
sfi
…
sh
…
sn
…
soc
…
spi
Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2014-08-08 11:00:26 -07:00
spmi
…
ssb
…
staging
Merge branch 'akpm' (second patchbomb from Andrew Morton)
2014-08-08 15:57:47 -07:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2014-08-06 20:10:32 -07:00
tc
…
thermal
…
thunderbolt
…
tty
Merge branch 'akpm' (second patchbomb from Andrew Morton)
2014-08-08 15:57:47 -07:00
uio
…
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-08-06 21:03:53 -07:00
uwb
uwb/whci: use correct structure type name in sizeof
2014-08-01 15:48:08 -07:00
vfio
drivers/vfio: EEH support for VFIO PCI device
2014-08-05 15:28:48 +10:00
vhost
…
video
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2014-08-10 21:31:58 -07:00
virt
…
virtio
…
vlynq
…
vme
vme: bridges: use pci_zalloc_consistent
2014-08-08 15:57:30 -07:00
w1
…
watchdog
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-08-07 08:47:00 -07:00
xen
Merge tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2014-08-07 11:33:15 -07:00
zorro
…
Kconfig
Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2014-08-04 17:32:24 -07:00
Makefile
Merge tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2014-08-04 18:34:04 -07:00