Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Thu, 20 May 2010 16:20:59 +0000 (09:20 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...

22 files changed:
1  2 
Documentation/DocBook/libata.tmpl
Documentation/cgroups/cgroups.txt
Documentation/filesystems/proc.txt
Documentation/intel_txt.txt
Documentation/kprobes.txt
Documentation/trace/events.txt
MAINTAINERS
arch/arm/mach-s3c2443/clock.c
arch/arm/plat-samsung/include/plat/gpio-core.h
arch/s390/include/asm/thread_info.h
arch/um/drivers/line.c
arch/x86/include/asm/percpu.h
arch/x86/include/asm/thread_info.h
drivers/firewire/ohci.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/atombios.h
drivers/pci/pci.c
drivers/usb/host/ehci-omap.c
fs/logfs/logfs.h
kernel/cgroup.c
mm/memcontrol.c
net/ipv4/ipmr.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
diff --cc net/ipv4/ipmr.c
Simple merge