davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2daa79ec21
kernel-ark/net/netfilter/ipvs
History
Linus Torvalds 98793265b4 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: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
2012-01-08 13:21:22 -08:00
..
ip_vs_app.c
ip_vs_conn.c ipvs: try also real server with port 0 in backup server 2011-12-31 16:06:29 +01:00
ip_vs_core.c net: remove ipv6_addr_copy() 2011-11-22 16:43:32 -05:00
ip_vs_ctl.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-01-02 18:56:49 -05:00
ip_vs_dh.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_vs_est.c
ip_vs_ftp.c ipvs: Expose ip_vs_ftp module parameters via sysfs. 2011-11-01 09:19:21 +01:00
ip_vs_lblc.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_vs_lblcr.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_vs_lc.c
ip_vs_nfct.c ipvs: Remove unused parameter from ip_vs_confirm_conntrack() 2011-11-01 09:19:29 +01:00
ip_vs_nq.c
ip_vs_pe_sip.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
ip_vs_pe.c
ip_vs_proto_ah_esp.c
ip_vs_proto_sctp.c ipvs: Remove unused return value of protocol state transitions 2011-11-01 09:19:33 +01:00
ip_vs_proto_tcp.c ipvs: Remove unused return value of protocol state transitions 2011-11-01 09:19:33 +01:00
ip_vs_proto_udp.c ipvs: Remove unused return value of protocol state transitions 2011-11-01 09:19:33 +01:00
ip_vs_proto.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_vs_rr.c
ip_vs_sched.c
ip_vs_sed.c
ip_vs_sh.c IPVS: Modify the SH scheduler to use weights 2011-12-13 11:34:48 +01:00
ip_vs_sync.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-01-02 18:56:49 -05:00
ip_vs_wlc.c
ip_vs_wrr.c netfilter: Remove unnecessary OOM logging messages 2011-11-01 09:19:49 +01:00
ip_vs_xmit.c ipv6: Kill rt6i_dev and rt6i_expires defines. 2011-12-28 20:19:20 -05:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
Makefile