Commits · 0109253dee3d211619876d3345ecc4c312d1b153 · Kirill Smelkov / linux

19 Jun, 2009 37 commits
- Staging: comedi: remove C99 comments in pcl818.c · 0109253d
  Bill Pemberton authored Mar 27, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  0109253d
- Staging: comedi: remove C99 comments in das1800.c · a351ecf3
  Bill Pemberton authored Mar 27, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  a351ecf3
- Staging: comedi: remove C99 comments in APCI1710_82x54.c · cf0fd108
  Bill Pemberton authored Mar 27, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  cf0fd108
- Staging: comedi: remove C99 comments in acl7225b.c · ed276144
  Bill Pemberton authored Mar 27, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  ed276144
- Staging: comedi: remove C99 comments in 8253.h · 67d83b4f
  Bill Pemberton authored Mar 27, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  67d83b4f
- Staging: comedi: Remove str_AnalogInputHeader typedef in addi-data/addi_eeprom.c · 6a037d5f
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  6a037d5f
- Staging: comedi: Remove labpc_private typedef · 0a4eb4b6
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  0a4eb4b6
- Staging: comedi: Remove labpc_board_struct typedef · 9ad00740
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  9ad00740
- Staging: comedi: Remove str_ADDIDATA_RTDStruct typedef in addi-data/hwdrv_apci3200 · 70275063
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  70275063
- Staging: comedi: Remove str_BoardInfos typedef in addi-data/hwdrv_apci3200 · 0a4de47b
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  0a4de47b
- Staging: comedi: Remove str_Module typedef in addi-data/hwdrv_apci3200.h · ecab384b
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  ecab384b
- Staging: comedi: Remove str_AnalogReadInformation typedef in addi-data/hwdrv_apci3120.h · 0077f93c
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  0077f93c
- Staging: comedi: Remove str_TimerMainHeader typedef in addi-data/addi_eeprom.c · 73b0d70a
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  73b0d70a
- Staging: comedi: Remove str_TimerDetails typedef in addi-data/addi_eeprom.c · cc0ea813
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  cc0ea813
- Staging: comedi: Remove str_DigitalOutputHeader typedef in addi-data/addi_eeprom.c · d2e0cc9a
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  d2e0cc9a
- Staging: comedi: Remove str_DigitalInputHeader typedef in addi-data/addi_eeprom.c · a28f34b7
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  a28f34b7
- Staging: comedi: Remove str_MainHeader typedef in addi-data/addi_eeprom.c · 8881b568
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  8881b568
- Staging: comedi: Remove addi_private typedef in addi-data · e320671e
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  e320671e
- Staging: comedi: Remove str_ModuleInfo typedef in addi-data · b4ce4f16
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  b4ce4f16
- Staging: comedi: Remove boardtype typedef in addi-data · 6a770eca
  Bill Pemberton authored Mar 25, 2009
```
typedef for boardtype removed and struct renamed to
addi_board
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  6a770eca
- Staging: comedi: Remove PCRANGE typedef in addi-data · 1c09a82c
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  1c09a82c
- Staging: comedi: Remove ULONG_PTR typedef in addi-data · a3435c92
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  a3435c92
- Staging: comedi: Remove DWORD and *PDWORD typedefs in addi-data · 756e9d7c
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  756e9d7c
- Staging: comedi: Remove ULONG and *PULONG typedefs in addi-data · 82a6e2e7
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  82a6e2e7
- Staging: comedi: Remove LONG and *PLONG typedefs in addi-data · 2b6257c5
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  2b6257c5
- Staging: comedi: Remove UINT and *PUINT typedefs in addi-data · 117102b0
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  117102b0
- Staging: comedi: Remove INT and *PINT typedefs in addi-data · 74b894e5
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  74b894e5
- Staging: comedi: Remove WORD and *PWORD typedefs in addi-data · babf0ede
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  babf0ede
- Staging: comedi: Remove USHORT and *PUSHORT typedefs in addi-data · a9fce7c9
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  a9fce7c9
- Staging: comedi: Remove SHORT and *PSHORT typedefs in addi-data · 66673a7c
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  66673a7c
- Staging: comedi: Remove BYTE and *PBYTE typedefs in addi-data · 1783fbfe
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  1783fbfe
- Staging: comedi: Remove local_info_t typedef in ni_daq_dio24 · 2ec9f875
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  2ec9f875
- Staging: comedi: Remove dio24_board_struct typedef · cf4c8d1b
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  cf4c8d1b
- Staging: comedi: Remove local_info_t typedef in ni_labpc_cs · e3f9f2c8
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  e3f9f2c8
- Staging: comedi: Remove ni_private typedef · 3301cc76
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  3301cc76
- Staging: comedi: Remove ni_board typedef · 8ab41df0
  Bill Pemberton authored Mar 25, 2009
```
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  8ab41df0
- Staging: add mailing list address for staging tree · 1c6ccf62
  Greg Kroah-Hartman authored Jun 05, 2009
```
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
```
  1c6ccf62
18 Jun, 2009 3 commits

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 0732f877

Linus Torvalds authored Jun 18, 2009

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: clean up jbd2_journal_try_to_free_buffers()
  ext4: Don't update ctime for non-extent-mapped inodes
  ext4: Fix up whitespace issues in fs/ext4/inode.c
  ext4: Fix 64-bit block type problem on 32-bit platforms
  ext4: teach the inode allocator to use a goal inode number
  ext4: Use a hash of the topdir directory name for the Orlov parent group
  ext4: document the "abort" mount option
  ext4: move the abort flag from s_mount_opts to s_mount_flags
  ext4: update the s_last_mounted field in the superblock
  ext4: change s_mount_opt to be an unsigned int
  ext4: online defrag -- Add EXT4_IOC_MOVE_EXT ioctl
  ext4: avoid unnecessary spinlock in critical POSIX ACL path
  ext3: avoid unnecessary spinlock in critical POSIX ACL path
  ext4: convert instrumentation from markers to tracepoints
  jbd2: convert instrumentation from markers to tracepoints

0732f877

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 15fc204a

Linus Torvalds authored Jun 18, 2009

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...

15fc204a

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d2aa4550

Linus Torvalds authored Jun 18, 2009

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck

d2aa4550