1. 18 Aug, 2008 24 commits
  2. 17 Aug, 2008 12 commits
  3. 16 Aug, 2008 4 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 9c0d2a20
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (38 commits)
        [ARM] 5191/1: ARM: remove CVS keywords
        [ARM] pxafb: fix the warning of incorrect lccr when lcd_conn is specified
        [ARM] pxafb: add flag to specify output format on LDD pins when base is RGBT16
        [ARM] pxafb: fix the incorrect configuration of GPIO77 as ACBIAS for TFT LCD
        [ARM] 5198/1: PalmTX: PCMCIA fixes
        [ARM] Fix a pile of broken watchdog drivers
        [ARM] update mach-types
        [ARM] 5196/1: fix inline asm constraints for preload
        [ARM] 5194/1: update .gitignore
        [ARM] add proc-macros.S include to proc-arm940 and proc-arm946
        [ARM] 5192/1: ARM TLB: add v7wbi_{possible,always}_flags to {possible,always}_tlb_flags
        [ARM] 5193/1: Wire up missing syscalls
        [ARM] traps: don't call undef hook functions with spinlock held
        [ARM] 5183/2: Provide Poodle LoCoMo GPIO names
        [ARM] dma-mapping: provide sync_range APIs
        [ARM] dma-mapping: improve type-safeness of DMA translations
        [ARM] Kirkwood: instantiate the orion_spi driver in the platform code
        [ARM] prevent crashing when too much RAM installed
        [ARM] Kirkwood: Instantiate mv_xor driver
        [ARM] Orion: Instantiate mv_xor driver for 5182
    • David Woodhouse's avatar
      Fix header export of videodev2.h, ivtv.h, ivtvfb.h · 5e6b83ed
      David Woodhouse authored
      The exported copy of videodev2.h contains this line:
      	#define #include <sys/time.h>
      This is because for some reason it defines __user for itself -- despite
      the fact that we remove all instances of __user when exporting headers.
      _All_ pointers in userspace are user pointers. Fix it by removing the
      unnecessary '#define __user' from the file.
      The new headers ivtv.h and ivtvfb.h would have the same problem... if
      whoever put them there had actually remembered to add them to the Kbuild
      file while he was at it. Fix those too, and export them as was
      presumably intended.
      Note that includes of <linux/compiler.h> are also stripped by the header
      export process, so those don't need to be conditional.
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
      Acked-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Hugh Dickins's avatar
      mm: VM_flags comment fixes · 605d9288
      Hugh Dickins authored
      Try to comment away a little of the confusion between mm's vm_area_struct
      vm_flags and vmalloc's vm_struct flags: based on an idea by Ulrich Drepper.
      Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Adrian Bunk's avatar
      [ARM] 5191/1: ARM: remove CVS keywords · 66bfa2f0
      Adrian Bunk authored
      This patch removes CVS keywords that weren't updated for a long time.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>