Paul Gortmaker
211ed86510
net: delete all instances of special processing for token ring ...
We are going to delete the Token ring support. This removes any
special processing in the core networking for token ring, (aside
from net/tr.c itself), leaving the drivers and remaining tokenring
support present but inert.
The mass removal of the drivers and net/tr.c will be in a separate
commit, so that the history of these files that we still care
about won't have the giant deletion tied into their history.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2012-05-15 20:14:35 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
asm-generic: Allow overriding clock_t and add attributes to siginfo_t
2012-04-23 16:29:18 -07:00
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next
2012-03-19 09:50:33 -07:00
[SCSI] libsas, libata: fix start of life for a sas ata_port
2012-04-23 12:11:47 +01:00
ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
2012-04-10 14:53:55 +02:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
211ed86510