kernel-fxtec-pro1x/Documentation/DocBook
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-04-21 12:43:23 -07:00
.gitignore
80211.tmpl mac80211: notify driver of rate control updates 2012-04-10 14:54:08 -04:00
alsa-driver-api.tmpl
debugobjects.tmpl
device-drivers.tmpl Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi 2012-04-02 09:50:40 -07:00
deviceiobook.tmpl
drm.tmpl
filesystems.tmpl Documentation: broken URL in filesystems.tmpl 2012-02-28 15:56:09 +01:00
gadget.tmpl
genericirq.tmpl
kernel-api.tmpl
kernel-hacking.tmpl
kernel-locking.tmpl
kgdb.tmpl kgdb,debug_core: add the ability to control the reboot notifier 2012-03-22 15:07:16 -05:00
libata.tmpl Documentation: Fix multiple typo in Documentation 2012-03-07 16:08:24 +01:00
librs.tmpl
lsm.tmpl
Makefile
mcabook.tmpl
media_api.tmpl
mtdnand.tmpl
networking.tmpl
rapidio.tmpl
regulator.tmpl
s390-drivers.tmpl
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl
usb.tmpl
writing-an-alsa-driver.tmpl
writing_usb_driver.tmpl
z8530book.tmpl