linux/arch
Linus Torvalds f063a0c0c9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
  Staging: brcm80211: fix usage of roundup in structures
  Staging: bcm: fix up network device reference counting
  Staging: keucr: fix up US_ macro change
  staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
  staging: brcm80211: Remove unnecessary header files.
  staging: brcm80211: Remove unnecessary includes from bcmutils.c
  staging: brcm80211: Removed unnecessary pktsetprio() function.
  Staging: brcm80211: remove typedefs.h
  Staging: brcm80211: remove uintptr typedef usage
  Staging: hv: remove struct vmbus_channel_interface
  Staging: hv: remove Open from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_open directly
  Staging: hv: netvsc: call vmbus_open directly
  Staging: hv: channel: export vmbus_open to modules
  Staging: hv: remove Close from struct vmbus_channel_interface
  Staging: hv: netvsc: call vmbus_close directly
  Staging: hv: storvsc: call vmbus_close directly
  Staging: hv: channel: export vmbus_close to modules
  Staging: hv: remove SendPacket from struct vmbus_channel_interface
  Staging: hv: storvsc: call vmbus_sendpacket directly
  ...

Fix up conflicts in
	drivers/staging/cx25821/cx25821-audio-upstream.c
	drivers/staging/cx25821/cx25821-audio.h
due to warring whitespace cleanups (neither of which were all that great)
2010-10-28 12:13:00 -07:00
..
alpha alpha: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
avr32 ptrace: cleanup arch_ptrace() on avr32 2010-10-27 18:03:10 -07:00
blackfin ptrace: cleanup arch_ptrace() and friends on Blackfin 2010-10-27 18:03:10 -07:00
cris ptrace: cleanup arch_ptrace() on cris 2010-10-27 18:03:10 -07:00
frv ptrace: cleanup arch_ptrace() on frv 2010-10-27 18:03:10 -07:00
h8300 ptrace: cleanup arch_ptrace() on h8300 2010-10-27 18:03:11 -07:00
ia64 taskstats: use real microsecond granularity for CPU times 2010-10-27 18:03:17 -07:00
m32r ptrace: cleanup arch_ptrace() on m32r 2010-10-27 18:03:11 -07:00
m68k ptrace: cleanup arch_ptrace() on m68k 2010-10-27 18:03:11 -07:00
m68knommu ptrace: cleanup arch_ptrace() on m68knommu 2010-10-27 18:03:11 -07:00
microblaze ptrace: cleanup arch_ptrace() on microblaze 2010-10-27 18:03:11 -07:00
mips mips: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
mn10300 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 2010-10-27 18:53:26 -07:00
parisc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2010-10-28 09:24:14 -07:00
powerpc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2010-10-27 19:04:36 -07:00
s390 taskstats: use real microsecond granularity for CPU times 2010-10-27 18:03:17 -07:00
score ptrace: cleanup arch_ptrace() on score 2010-10-27 18:03:12 -07:00
sh Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2010-10-28 12:06:51 -07:00
sparc sparc: remove dma64_addr_t usage 2010-10-27 18:03:17 -07:00
tile Remove duplicate includes from many files 2010-10-27 18:03:18 -07:00
um ptrace: cleanup arch_ptrace() on um 2010-10-27 18:03:12 -07:00
x86 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2010-10-28 11:59:52 -07:00
xtensa ptrace: cleanup arch_ptrace() on xtensa 2010-10-27 18:03:12 -07:00
.gitignore
Kconfig