Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* '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
  ...

diff --cc Documentation/DocBook/libata.tmpl
Simple merge

diff --cc Documentation/cgroups/cgroups.txt
Simple merge

diff --cc Documentation/filesystems/proc.txt
Simple merge

diff --cc Documentation/intel_txt.txt
Simple merge

diff --cc Documentation/kprobes.txt
Simple merge

diff --cc Documentation/trace/events.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-s3c2443/clock.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/gpio-core.h
Simple merge

diff --cc arch/s390/include/asm/thread_info.h
Simple merge

diff --cc arch/um/drivers/line.c
Simple merge

diff --cc arch/x86/include/asm/percpu.h
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

diff --cc drivers/firewire/ohci.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/radeon/atombios.h
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/usb/host/ehci-omap.c
Simple merge

diff --cc fs/logfs/logfs.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge