Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts: sound/pci/Kconfig
Showing
- Makefile 14 additions, 1 deletionMakefile
- arch/x86/kernel/microcode.c 2 additions, 2 deletionsarch/x86/kernel/microcode.c
- drivers/atm/Makefile 3 additions, 3 deletionsdrivers/atm/Makefile
- drivers/atm/ambassador.c 57 additions, 83 deletionsdrivers/atm/ambassador.c
- drivers/atm/ambassador.h 0 additions, 11 deletionsdrivers/atm/ambassador.h
- drivers/atm/atmsar11.data 0 additions, 2063 deletionsdrivers/atm/atmsar11.data
- drivers/atm/atmsar11.regions 0 additions, 6 deletionsdrivers/atm/atmsar11.regions
- drivers/atm/atmsar11.start 0 additions, 4 deletionsdrivers/atm/atmsar11.start
- drivers/base/Kconfig 64 additions, 0 deletionsdrivers/base/Kconfig
- drivers/base/firmware_class.c 32 additions, 3 deletionsdrivers/base/firmware_class.c
- drivers/bluetooth/bfusb.c 2 additions, 1 deletiondrivers/bluetooth/bfusb.c
- drivers/bluetooth/bt3c_cs.c 2 additions, 1 deletiondrivers/bluetooth/bt3c_cs.c
- drivers/char/cyclades.c 5 additions, 5 deletionsdrivers/char/cyclades.c
- drivers/char/dsp56k.c 33 additions, 51 deletionsdrivers/char/dsp56k.c
- drivers/char/ip2/fip_firm.h 0 additions, 2149 deletionsdrivers/char/ip2/fip_firm.h
- drivers/char/ip2/ip2base.c 2 additions, 3 deletionsdrivers/char/ip2/ip2base.c
- drivers/char/ip2/ip2main.c 36 additions, 11 deletionsdrivers/char/ip2/ip2main.c
- drivers/char/moxa.c 2 additions, 2 deletionsdrivers/char/moxa.c
- drivers/firmware/dell_rbu.c 1 addition, 1 deletiondrivers/firmware/dell_rbu.c
- drivers/media/common/tuners/tuner-xc2028.c 1 addition, 1 deletiondrivers/media/common/tuners/tuner-xc2028.c
Loading
Please register or sign in to comment