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
..
9p
802
8021q
appletalk
atm
ax25
batman-adv
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-04 21:35:43 -05:00
bridge
caif
can
ceph
core	ethtool: Remove ethtool_ops::set_rx_ntuple operation	2012-01-04 14:10:28 -05:00
dcb
dccp
decnet
dns_resolver
dsa
econet
ethernet
ieee802154
ipv4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
ipv6	ipv6/addrconf: speedup /proc/net/if_inet6 filling	2012-01-04 16:00:57 -05:00
ipx
irda
iucv
key
l2tp
lapb
llc
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
netfilter	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
netlabel
netlink
netrom
nfc	NFC: Export a new attribute nfcid1 in target info	2012-01-04 14:30:43 -05:00
openvswitch
packet
phonet
rds
rfkill	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-05 10:13:24 -05:00
rose
rxrpc
sched	net_sched: red: split red_parms into parms and vars	2012-01-05 14:01:21 -05:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
sunrpc	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
tipc
unix	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
wanrouter
wimax
wireless	wireless: Treat IPv6 diffserv the same as IPv4 for 802.11e	2012-01-04 14:30:43 -05:00
x25
xfrm
compat.c
Kconfig
Makefile
nonet.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-01-06 17:22:09 -08:00
sysctl_net.c