linux/drivers/nfc
Linus Torvalds 80cc38b163 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
 "The usual stuff from trivial tree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  treewide: relase -> release
  Documentation/cgroups/memory.txt: fix stat file documentation
  sysctl/net.txt: delete reference to obsolete 2.4.x kernel
  spinlock_api_smp.h: fix preprocessor comments
  treewide: Fix typo in printk
  doc: device tree: clarify stuff in usage-model.txt.
  open firmware: "/aliasas" -> "/aliases"
  md: bcache: Fixed a typo with the word 'arithmetic'
  irq/generic-chip: fix a few kernel-doc entries
  frv: Convert use of typedef ctl_table to struct ctl_table
  sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
  doc: clk: Fix incorrect wording
  Documentation/arm/IXP4xx fix a typo
  Documentation/networking/ieee802154 fix a typo
  Documentation/DocBook/media/v4l fix a typo
  Documentation/video4linux/si476x.txt fix a typo
  Documentation/virtual/kvm/api.txt fix a typo
  Documentation/early-userspace/README fix a typo
  Documentation/video4linux/soc-camera.txt fix a typo
  lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
  ...
2013-07-04 11:40:58 -07:00
..
microread NFC: mei: Do not disable MEI devices from their remove routine 2013-05-21 10:48:41 +02:00
pn544 NFC: mei: Do not disable MEI devices from their remove routine 2013-05-21 10:48:41 +02:00
Kconfig NFC: mei_phy depends on INTEL_MEI 2013-05-21 10:48:40 +02:00
Makefile NFC: mei: Add a common mei bus API for NFC drivers 2013-04-16 00:39:31 +02:00
mei_phy.c NFC: mei_phy: Register event callback when enabling the device 2013-05-21 10:48:40 +02:00
mei_phy.h NFC: mei: Add a common mei bus API for NFC drivers 2013-04-16 00:39:31 +02:00
nfcwilink.c NFC: Initial Secure Element API 2013-01-10 00:51:54 +01:00
pn533.c treewide: Fix typo in printk 2013-05-28 12:02:13 +02:00