q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/Documentation
History
Linus Torvalds 6d6b89bd2e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt
 		2010-03-02 07:55:08 -08:00
..
ABI Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block 2010-03-01 09:00:29 -08:00
DocBook Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
PCI
…
RCU
…
accounting
…
acpi
…
aoe
…
arm
…
auxdisplay
…
blackfin
…
block
…
blockdev
…
cdrom
…
cgroups
…
connector
…
console
…
cpu-freq
…
cpuidle
…
cris
…
crypto
…
development-process
…
device-mapper
…
driver-model
…
dvb
…
early-userspace
…
fault-injection
…
fb
…
filesystems
…
firmware_class
…
frv
…
hwmon
…
i2c
…
i2o
…
ia64
…
ide
…
infiniband
…
input Merge branch 'next' into for-linus 2010-02-28 23:55:20 -08:00
ioctl
…
isdn
…
ja_JP
…
kbuild
…
kdump
…
ko_KR
…
kvm
…
laptops
…
lguest
…
m68k
…
make
…
mips
…
misc-devices
…
mn10300
…
mtd
…
namespaces
…
netlabel
…
networking
…
parisc
…
pcmcia
…
power
…
powerpc Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
pps
…
prctl
…
s390
…
scheduler
…
scsi
…
serial
…
sh
…
sound Merge branch 'topic/hda' into for-linus 2010-03-01 12:38:54 +01:00
sparc
…
spi
…
sysctl
…
telephony
…
thermal
…
timers
…
trace
…
uml
…
usb
…
video4linux
…
vm
…
w1
…
watchdog
…
wimax
…
x86
…
zh_CN
…
00-INDEX
…
BUG-HUNTING
…
Changes
…
CodingStyle
…
DMA-API.txt
…
DMA-ISA-LPC.txt
…
DMA-attributes.txt
…
HOWTO
…
IO-mapping.txt
…
IPMI.txt
…
IRQ-affinity.txt
…
IRQ.txt
…
Intel-IOMMU.txt
…
Makefile
…
ManagementStyle
…
SAK.txt
…
SELinux.txt
…
SM501.txt
…
SecurityBugs
…
Smack.txt
…
SubmitChecklist
…
SubmittingDrivers
…
SubmittingPatches
…
VGA-softcursor.txt
…
applying-patches.txt
…
atomic_ops.txt
…
bad_memory.txt
…
basic_profiling.txt
…
binfmt_misc.txt
…
braille-console.txt
…
bt8xxgpio.txt
…
btmrvl.txt
…
cachetlb.txt Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-03-01 09:15:15 -08:00
cpu-hotplug.txt
…
cpu-load.txt
…
cputopology.txt
…
credentials.txt
…
dcdbas.txt
…
debugging-modules.txt
…
debugging-via-ohci1394.txt
…
dell_rbu.txt
…
devices.txt
…
dmaengine.txt
…
dontdiff
…
dynamic-debug-howto.txt
…
edac.txt
…
eisa.txt
…
email-clients.txt
…
feature-removal-schedule.txt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-03-02 07:55:08 -08:00
flexible-arrays.txt
…
futex-requeue-pi.txt
…
gcov.txt
…
gpio.txt
…
highuid.txt
…
hw_random.txt
…
initrd.txt
…
intel_txt.txt
…
io-mapping.txt
…
io_ordering.txt
…
iostats.txt
…
irqflags-tracing.txt
…
isapnp.txt
…
java.txt
…
kernel-doc-nano-HOWTO.txt
…
kernel-docs.txt
…
kernel-parameters.txt Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2010-02-28 19:23:06 -08:00
keys-request-key.txt
…
keys.txt
…
kmemcheck.txt
…
kmemleak.txt
…
kobject.txt
…
kprobes.txt
…
kref.txt
…
ldm.txt
…
leds-class.txt
…
leds-lp3944.txt
…
local_ops.txt
…
lockdep-design.txt
…
lockstat.txt
…
logo.gif
…
logo.txt
…
magic-number.txt
…
mca.txt
…
md.txt
…
memory-barriers.txt
…
memory-hotplug.txt
…
memory.txt
…
mono.txt
…
mutex-design.txt
…
nmi_watchdog.txt
…
nommu-mmap.txt
…
numastat.txt
…
oops-tracing.txt
…
parport-lowlevel.txt
…
parport.txt
…
pi-futex.txt
…
pnp.txt
…
preempt-locking.txt
…
printk-formats.txt
…
prio_tree.txt
…
rbtree.txt
…
rfkill.txt
…
robust-futex-ABI.txt
…
robust-futexes.txt
…
rt-mutex-design.txt
…
rt-mutex.txt
…
rtc.txt
…
serial-console.txt
…
sgi-ioc4.txt
…
sgi-visws.txt
…
slow-work.txt
…
sparse.txt
…
spinlocks.txt
…
stable_api_nonsense.txt
…
stable_kernel_rules.txt
…
svga.txt
…
sysfs-rules.txt
…
sysrq.txt
…
tomoyo.txt
…
unaligned-memory-access.txt
…
unicode.txt
…
unshare.txt
…
vgaarbiter.txt
…
video-output.txt
…
volatile-considered-harmful.txt
…
voyager.txt
…
zorro.txt
…