Archived
14
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers
Linus Torvalds a57793651f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits)
  [IPV6]: Fix again the fl6_sock_lookup() fixed locking
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix
  [IPV6]: Fix race in ipv6_flowlabel_opt() when inserting two labels
  [IPV6]: Lost locking in fl6_sock_lookup
  [IPV6]: Lost locking when inserting a flowlabel in ipv6_fl_list
  [NETFILTER]: xt_sctp: fix mistake to pass a pointer where array is required
  [NET]: Fix OOPS due to missing check in dev_parse_header().
  [TCP]: Remove lost_retrans zero seqno special cases
  [NET]: fix carrier-on bug?
  [NET]: Fix uninitialised variable in ip_frag_reasm()
  [IPSEC]: Rename mode to outer_mode and add inner_mode
  [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP
  [IPSEC]: Use the top IPv4 route's peer instead of the bottom
  [IPSEC]: Store afinfo pointer in xfrm_mode
  [IPSEC]: Add missing BEET checks
  [IPSEC]: Move type and mode map into xfrm_state.c
  [IPSEC]: Fix length check in xfrm_parse_spi
  [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi
  [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi
  [IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input
  ...
2007-10-18 14:40:30 -07:00
..
acorn/char unicode diacritics support 2007-10-17 08:42:52 -07:00
acpi Hibernation: Check if ACPI is enabled during restore in the right place 2007-10-18 14:37:20 -07:00
amba
ata sparse pointer use of zero as null 2007-10-18 14:37:31 -07:00
atm Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2007-10-16 11:23:06 -07:00
auxdisplay
base sparse pointer use of zero as null 2007-10-18 14:37:31 -07:00
block Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
bluetooth
cdrom sysctl: remove broken cdrom binary sysctls 2007-10-18 14:37:23 -07:00
char IPMI: add 0.9 support 2007-10-18 14:37:32 -07:00
clocksource
connector
cpufreq
crypto
dca
dio
dma I/OAT: Add completion callback for async_tx interface use 2007-10-18 14:37:32 -07:00
edac
eisa
fc4
firewire firewire: fw-cdev: reorder wakeup vs. spinlock 2007-10-17 00:00:10 +02:00
firmware
hid
hwmon Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
i2c Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
ide amd74xx: remove /proc/ide/amd74xx 2007-10-16 22:29:58 +02:00
ieee1394 ieee1394: ieee1394_core.c: use DEFINE_SPINLOCK for spinlock definition 2007-10-16 23:59:59 +02:00
infiniband Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
input freezer: introduce freezer-friendly waiting macros 2007-10-18 14:37:19 -07:00
isdn Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
kvm
leds Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2007-10-16 11:23:06 -07:00
lguest Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 2007-10-17 11:10:11 -07:00
macintosh fix adbhid mismerge 2007-10-16 19:04:49 -07:00
mca
md md: make sure read errors are auto-corrected during a 'check' resync in raid1 2007-10-17 08:43:03 -07:00
media Replace __attribute_pure__ with __pure 2007-10-18 14:37:32 -07:00
message I2O: Fix "defined but not used" build warnings 2007-10-17 08:42:56 -07:00
mfd
misc Driver for the Atmel on-chip SSC on AT32AP and AT91 2007-10-17 08:42:47 -07:00
mmc mmc: at91_mci: cleanup: use MCI_ERRORS 2007-10-17 21:35:10 +02:00
mtd Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
net Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-18 14:40:30 -07:00
nubus
of [SPARC/64]: Consolidate of_register_driver 2007-10-17 21:17:42 -07:00
oprofile
parisc
parport sysctl: parport remove binary paths 2007-10-18 14:37:23 -07:00
pci
pcmcia pcmcia: CompactFlash driver for PA Semi Electra boards 2007-10-17 08:42:48 -07:00
pnp PNP: add debug message for adding new device 2007-10-17 08:43:04 -07:00
power Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
ps3 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
rapidio
rtc Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
s390 unicode diacritics support 2007-10-17 08:42:52 -07:00
sbus [SPARC] Videopix Frame Grabber: Convert device_lock_sem to mutex 2007-10-17 19:40:31 -07:00
scsi Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
serial serial: turn serial console suspend a boot rather than compile time option 2007-10-18 14:37:19 -07:00
sh
sn
spi Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
ssb [PATCH] ssb: fix build failure 2007-10-16 21:04:11 -04:00
tc lk201: remove obsolete driver 2007-10-17 08:42:57 -07:00
telephony
uio
usb Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
video Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
w1 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
xen Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
zorro
Kconfig
Makefile