linux/include/asm-generic
Linus Torvalds 3f5785ec31 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
2011-05-25 17:00:17 -07:00
..
bitops bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
4level-fixup.h
atomic64.h
atomic-long.h
atomic.h
audit_change_attr.h audit: support the "standard" <asm-generic/unistd.h> 2011-05-04 14:41:28 -04:00
audit_dir_write.h audit: support the "standard" <asm-generic/unistd.h> 2011-05-04 14:41:28 -04:00
audit_read.h audit: support the "standard" <asm-generic/unistd.h> 2011-05-04 14:41:28 -04:00
audit_signal.h
audit_write.h audit: support the "standard" <asm-generic/unistd.h> 2011-05-04 14:41:28 -04:00
auxvec.h
bitops.h bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
bitsperlong.h
bug.h bug.h: Fix build with CONFIG_PRINTK disabled. 2011-05-24 16:15:56 -04:00
bugs.h
cache.h
cacheflush.h asm-generic/cacheflush.h: flush icache when copying to user pages 2011-05-25 08:39:37 -07:00
checksum.h
cmpxchg-local.h
cmpxchg.h
cputime.h time: Add nsecs_to_cputime64 interface for asm-generic 2011-01-26 12:33:20 +01:00
current.h
delay.h
device.h
div64.h
dma-coherent.h
dma-mapping-broken.h
dma-mapping-common.h
dma.h
emergency-restart.h
errno-base.h
errno.h mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally 2011-03-17 13:08:27 -03:00
fb.h
fcntl.h New kind of open files - "location only". 2011-03-15 02:21:45 -04:00
ftrace.h asm-generic headers: add ftrace.h 2011-03-17 09:19:04 +08:00
futex.h futex: Sanitize futex ops argument types 2011-03-11 12:23:31 +01:00
getorder.h
gpio.h
hardirq.h
hw_irq.h
ide_iops.h
int-l64.h
int-ll64.h
io.h asm-generic: fix inX/outX functions for architectures that have PCI 2011-03-17 09:19:03 +08:00
ioctl.h
ioctls.h tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys 2011-02-17 14:16:30 -08:00
iomap.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
Kbuild
Kbuild.asm
kdebug.h
kmap_types.h
libata-portmap.h
linkage.h
local64.h
local.h
memory_model.h
mm_hooks.h
mman-common.h thp: mm: define MADV_NOHUGEPAGE 2011-01-13 17:32:47 -08:00
mman.h
mmu_context.h
mmu.h
module.h
msgbuf.h
mutex-dec.h
mutex-null.h
mutex-xchg.h
mutex.h
page.h
param.h
parport.h
pci-dma-compat.h
pci.h
percpu.h
pgalloc.h
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h [S390] merge page_test_dirty and page_clear_dirty 2011-05-23 10:24:31 +02:00
poll.h
posix_types.h
resource.h ulimit: raise default hard ulimit on number of files to 4096 2011-05-25 08:39:43 -07:00
rtc.h
scatterlist.h
sections.h x86: Separate out entry text section 2011-03-08 17:22:11 +01:00
segment.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
siginfo.h Fix common misspellings 2011-03-31 11:26:23 -03:00
signal-defs.h
signal.h
sizes.h asm-generic headers: add sizes.h 2011-03-17 09:19:04 +08:00
socket.h
sockios.h
spinlock.h
stat.h
statfs.h
string.h
swab.h
syscall.h
syscalls.h
system.h
termbits.h
termios-base.h
termios.h
timex.h
tlb.h mm: uninline large generic tlb.h functions 2011-05-25 08:39:20 -07:00
tlbflush.h
topology.h
types.h add the common dma_addr_t typedef to include/linux/types.h 2011-03-22 17:44:09 -07:00
uaccess-unaligned.h
uaccess.h asm-generic headers: add arch-specific __strnlen_user calling in uaccess.h 2011-03-17 09:19:05 +08:00
ucontext.h
unaligned.h
unistd.h compat: fixes to allow working with tile arch 2011-05-12 15:51:36 -04:00
user.h asm-generic/user.h: Fix spelling in comment 2011-03-01 15:49:39 +01:00
vga.h
vmlinux.lds.h Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2011-05-24 11:53:42 -07:00
xor.h sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00