Larry Finger 48d67fe035 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/staging/bcm/headers.h drivers/staging/brcm80211/brcmfmac/dhd_linux.c drivers/staging/brcm80211/brcmfmac/dhd_sdio.c drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h drivers/staging/brcm80211/brcmfmac/wl_iw.c drivers/staging/et131x/et131x_netdev.c drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c drivers/staging/rtl8192e/r8192E.h drivers/staging/usbip/userspace/src/utils.h		2011-07-26 15:52:24 -05:00
..
Kconfig
lirc_bt829.c	staging/lirc_bt829: Return -ENODEV when no hardware is found.	2011-07-18 13:22:52 -07:00
lirc_ene0100.h
lirc_igorplugusb.c
lirc_imon.c
lirc_parallel.c
lirc_parallel.h
lirc_sasem.c
lirc_serial.c
lirc_sir.c
lirc_ttusbir.c
lirc_zilog.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-07-26 15:52:24 -05:00
Makefile
TODO
TODO.lirc_zilog